Skip to content

Instantly share code, notes, and snippets.

@fmendozaro

fmendozaro/Merging in git

Last active February 16, 2017 17:53
Show Gist options
  • Save fmendozaro/685954a662910c0b04b5ff787f4ec176 to your computer and use it in GitHub Desktop.
Save fmendozaro/685954a662910c0b04b5ff787f4ec176 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Merging in git
# Merging
Every time that there's a merge request accepted and you are currently working on something:
1. Change back to the master branch.
2. Update or Pull the changes from the remote master to your local master.
3. Change back to the branch you were working on.
4. Merge the local master into the local branch you are working on.
5. Solve the conflicts if there's any, otherwise continue working.
Your local master should have the same content that the remote master after this.
The branch could be different from them since you had some work pending, that's fine.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment