Re: Graceful way of handling Git merge conflicts?
Hello,
Sighted people use tools lie git cracken, which allow you to quickly choose what to keep and what to junk.
Sadly, I haven't found any tool like this accessible for us.
Most of the time, I resolve conflicts manually, by looking for markers <<<, === and >>> and fix what has to be fixed around them.
For more complex conflicts, there's no other choice than use diff.
Pro tipp: use -w flag in diff to ignore spaces and indentation
-- Audiogames-reflector mailing list Audiogames-reflector@sabahattin-gucukoglu.com https://sabahattin-gucukoglu.com/cgi-bin/mailman/listinfo/audiogames-reflector
