Skip to content

Instantly share code, notes, and snippets.

@LayneSmith

LayneSmith/git edit branch and merge

Last active October 8, 2015 14:29
Show Gist options
  • Save LayneSmith/1a9660527e35cdeba43b to your computer and use it in GitHub Desktop.
Save LayneSmith/1a9660527e35cdeba43b to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git edit branch and merge
git checkout <branch name>
git add .
git commit -m "enter a commit message"
git checkout master
git merge <branch name>
git add .
git commit -m "merged"
git push origin master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment