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

Waiting for the day when some adds AI to git's merge algorithms to avoid conflicts while cherry-picking, rebasing, merging.

Well. Do I? Not really.

#git #AI #MergeConflicts

"'It was fine before we added your code' doesn't mean that the team merged last did a poor job. This is counterintuitive but worth considering. If the merges had happened in the opposite order, the other team would seem to be at fault."

#softwareengineering #developerexperience #mergeconflicts #continuousintegration

https://www.industriallogic.com/blog/easy-integration/

Do you experience missed release schedules, flawed releases that must be rolled back, and error reports from customers?

These are common problems arising from the same underlying cause (at scale).

https://buff.ly/6EgA85l

#mergeConflicts #atScale #branchingStrategies