Skip to content

Instantly share code, notes, and snippets.

@AndrewRussellHayes

AndrewRussellHayes/git_mergetool.sh

Last active August 29, 2015 14:10
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 AndrewRussellHayes/6177e6eda1c0d3f58b1a to your computer and use it in GitHub Desktop.
Save AndrewRussellHayes/6177e6eda1c0d3f58b1a to your computer and use it in GitHub Desktop.
Download ZIP
git mergetool
Raw
git_mergetool.sh
+--------------------------------+
| LOCAL | BASE | REMOTE |
+--------------------------------+
| MERGED |
+--------------------------------+
Local : The branch merging INTO
Base : The most recent shared version. This is where diffget
and diff put commands are getting or putting into
Remote : The branch being merged into local
Merged : The file containing the conflict markers. Git has performed
as much automatic conflict resolution as possible and the
state of this file is a combination of both LOCAL and REMOTE
with conflict markers surrounding anything that Git could not
resolve itself. The mergetool should write the result of the
resolution to this file.
# command effect
[c jump to previous hunk
]c jump to next hunk
dp shorthand for `:diffput`
do shorthand for `:diffget`
#quit
wqa # save and quit all
qa # quit all, no write
qa! # silence error and quit all without saving
wqall # write and quit all
# walkthrough
# http://vimcasts.org/episodes/fugitive-vim-resolving-merge-conflicts-with-vimdiff/
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment