Follow

lmao what. with this set of git branches using merge.conflictStyle=diff3 and then removing the part corresponding to the base commit gives me a completely different, much more readable set of conflicts compared to the default conflict presentation?

· · Web · 0 · 0 · 0
Sign in to participate in the conversation
Mastodon

personal server for leo60228 (@leo@60228.dev)