Skip to content

Instantly share code, notes, and snippets.

@cheezedigital

cheezedigital/more on git, and github

Created July 25, 2014 23:49
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save cheezedigital/502febc7c7273080d679 to your computer and use it in GitHub Desktop.
Save cheezedigital/502febc7c7273080d679 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
more on git, and github
properly trying to merge a branch -
ex: I'm currently working on a bracnch called testing.
1. git status
2. git add file
3. git commit -m "throw in a nice message"
4. git push origin testing.
git checkout (whatever branch)
ex: git checkout master
1. git merge testing - this merges testing, and the code, and or changes just commited to the branch master.
2. git status
3. git push origin master.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment