Skip to content

Instantly share code, notes, and snippets.

@sydcanem

sydcanem/resolving_conflicts_in_merge.md

Last active August 29, 2015 14:06
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 sydcanem/35a9e7604446acf5d687 to your computer and use it in GitHub Desktop.
Save sydcanem/35a9e7604446acf5d687 to your computer and use it in GitHub Desktop.
Download ZIP
Git: Resolving merge conflicts properly with git blame.
Raw
resolving_conflicts_in_merge.md

Resolving merge conflicts properly with git blame

Continuing with github's guide to resolving merge conflicts.

This guide will go through resolving merge conflicts that spans to multiple files and more than one people has made a change on the conflicted files. Usually this conflicts occurs when a feature/release branch has made changes to common files or modules that was also been changed on the dev branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment