Skip to main content
Share Your Experience: Take the 2024 Developer Survey

Questions tagged [merge]

The tag has no usage guidance.

Filter by
Sorted by
Tagged with
0 votes
1 answer
200 views

vim mapping diffput / diffget to Ctrl+Left / Ctrl+Right with working buffer selection from count

Pretty new to mappings in Vim, In Diff Mode I've got C-Up and C-Down mapped to [c and ]c for diffjumping. I'm wanting to map C-Right and C-Left to :<C-U>diffput v:count<CR> and :<C-U>...
Jack T's user avatar
  • 1
0 votes
0 answers
30 views

After opening all args with :ba, go back to a single split

Generally when opening more than two or three files in vim, I use a single split, navigating between the files/buffers with :n/:N. Sometimes, however, I want to open all of them in visible splits at ...
judeanpeoplesfront's user avatar
1 vote
0 answers
84 views

Is it possible to use Vim's power (Vim buffers...) while doing 3 way merge in Meld?

Is it possible to use Vim's power (Vim buffers...) while doing 3 way merge in Meld ? I can see in Meld you can change the default editor: edit -> Preferences -> Editor -> default editor I ...
HarshaD's user avatar
  • 111
16 votes
4 answers
7k views

Is there a way to "take both" when using Vim as merge tool?

I'm using Vim as a 3-way merge too with Git and sometimes need to take changes from both local and remote branches. kdiff3 can do this with a couple of key presses, is there a way to do this in Vim?
synapse's user avatar
  • 263
10 votes
1 answer
536 views

Merge in external changes made while editing

If there are external changes made to a file being edited in Vim I understand that I can reload the content of the file by :edit. But, assume that (internally) I've made changes to the file that I ...
fuzzybear3965's user avatar
3 votes
1 answer
2k views

Undo diffget in vimdiff

Say I have a merge conflict in Git, and try to resolve it with vimdiff using diff3 view. Here is a screenshot: Now while resolving, I want to diffget once from LO see how it looks like, undo, and ...
bagrat's user avatar
  • 133
22 votes
5 answers
2k views

Merge blocks by interleaving lines

Is there a dedicated way to merge two blocks of text by interleaving lines, like passing from this: a1 a2 a3 a4 b1 b2 b3 b4 to that: a1 b1 a2 b2 a3 b3 a4 b4 in a few commands? ...
iago-lito's user avatar
  • 1,122
9 votes
2 answers
3k views

Git mergetool vimdiff command

I'm attempting to get something setup that invokes the vimdiff git merge tool externally, but because of the way the setup works, I need to invoke vimdiff manually (without git mergetool). Does anyone ...
Cameron Little's user avatar
15 votes
1 answer
3k views

vimdiff and merge conflicts

When merging branches under source control there is often the issue of a merge conflict with other developers. I know that we can use vimdiff to diff code changes against source control, but is there ...
Martin York's user avatar
  • 6,592