git vimdiff mergetool basic commands?
Alex R
I have executed git mergetool to try to resolve some merge conflicts.
It opens 3 text windows (within my SSH terminal) with different versions of code in each.
The code I want is in the window on the right.
How do I tell git to take this version and move on?
Here's the screen shot...
Roberto
According to this blogpost:
There are two basic strategies for reconciling a 3-way diff. You can either keep your cursor in the middle file, and run :diffget with the bufspec for the file containing the change you want to keep. Or you can position your cursor on the change that you want to keep, and run :diffput with the bufspec for the working copy file.
Now, a bufspec is a buffer number, a pattern for a buffer name or a part of a buffer name, like "v2" in "file.cpp.v2". If you type 2 plus CTRL+G, it shows you the buffer number and file.
Collected from the Internet
Please contact [email protected] to delete if infringement.
edited at
- Prev: Laravel 5: Integrity constraint violation: 1062 - Many to Many
- Next: PNG to PGM conversion without quality loss
Related
Related Related
- 1
What commands is required to revert changes made by git mergetool?
- 2
Amending a git mergetool job
- 3
adding winmerge as mergetool in git
- 4
Git conflict - mergetool not configured
- 5
Vimdiff and git all at once
- 6
Problems using diffmerge mergetool with git
- 7
Problems using diffmerge mergetool with git
- 8
Error mergetool code compare in git
- 9
What's the difference between vimdiff and vimdiff2 in git?
- 10
force git mergetool to amend a previously done merge
- 11
Git mergetool generates unwanted .orig files
- 12
Git mergetool meld on windows using putty
- 13
Select git mergetool based on file type
- 14
Git launches mergetool without any arguments
- 15
How to make git mergetool aware of diff markers
- 16
Why does my Git mergetool configuration not work?
- 17
Git mergetool meld on windows using putty
- 18
Git launches mergetool without any arguments
- 19
Resolve conflicts automatically with git-mergetool
- 20
`git mergetool`, A `fileName.~fileType` file was produced
- 21
Recover file deleted using git mergetool
- 22
Is it OK to copy (not clone) a git repository using basic Unix commands?
- 23
Switching panes within Git's Vimdiff in Tmux
- 24
git and vimdiff - close all files at once
- 25
Git partial merge conflict resolve in a file with vimdiff
- 26
Switching panes within Git's Vimdiff in Tmux
- 27
Is it possible to configure git mergetool to avoid .orig for a given merge tool?
- 28
Setting up and using Meld as your git difftool and mergetool
- 29
How to use Visual Studio Code as the default editor for Git MergeTool
Comments