Skip to content

Instantly share code, notes, and snippets.

@yurytello

yurytello/git merge

Last active August 29, 2015 14:07
Show Gist options
  • Save yurytello/0be7c575c55a39334f93 to your computer and use it in GitHub Desktop.
Save yurytello/0be7c575c55a39334f93 to your computer and use it in GitHub Desktop.
Download ZIP
Git merge and conflict resolution and vimdiff2
Raw
git merge
Comandos GIT
============
git fetch upstream
# En caso exista un nuevo branch
git checkout -b 8.0 upstream/8.0
# Realizamos el merge sin estrategia
git merge upstream/8.0
# Resolvemos los conflictos
git mergetool --tool=vimdiff2 --no-prompt <file>
# Realizamos el merge con estrategia (por default prevalece ours o theirs)
git merge -X [theirs|ours] upstream/8.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment