Anyone know a faster way to get through merge conflicts? Preferably on the terminal, I'm imagining a 'git add -p' style interface that shows all conflicts in all tracked files but with options to accept current or incoming like in vs code.

Also I'm not a big fan of vimdiff, it's slow to start (this is in Cygwin on Windows so everything is slow to start!), it only does one file at a time, and the colors make it hard to read. Also, I couldn't find shortcuts to accept current or incoming. This is vim, so all of these problems except the speed are solvable, but the speed is a deal breaker.

#git #askfedi #vimdiff #mergeconflicts

For years I've been using `vim -d` (or `vimdiff`) on two or more files to compare them and see the differences.

I just learned that there are special commands for working with diffs in `vimdiff`:

`]c` moves the cursor to the next block of differences.

`[c` moves the cursor to the previous block of differences.

`dp` pushes the diff that your cursor is on to the other file.

`do` obtains the change from the other file and applies it to the file that your cursor is on.

#vim #vimdiff

Linux `Vimdiff` Command – How to Compare Two Files in the Command Line

https://www.freecodecamp.org/news/compare-two-files-in-linux-using-vim/

#vim #vimdiff #editor #IDE