• pixelscript@lemmy.ml
    link
    fedilink
    English
    arrow-up
    5
    ·
    9 months ago

    You don’t. One of the core aspects of Git is that it fully expects conflicts to be inevitable, and it gives you tools to resolve them.

    I will say that if you learn to aggressively rebase branches, you can at least occasionally reduce the complexity of conflicts.

    If you are working on a long branch and three other branches that conflict with your changes land in the meantime, a simple merge will force you to reconcile all of those conflicts in one big stinky merge commit.

    If you instead rebase after each individual branch lands, you resolve the same number of conflicts but in three smaller, focused steps instead of one big ugly one. You also don’t get a merge commit full of redundant deltas that serve only to resync your branch to master; all the conflict resolution becomes baked in to your individual branch commits.

    Spreading out the problem is not reducing the problem. But it can make fixing the problem less daunting, which has a similar effect.

    • pcouy@lemmy.pierre-couy.fr
      link
      fedilink
      arrow-up
      3
      ·
      edit-2
      9 months ago

      That was the point of my comment, unless they wrote this ironically.

      Sorry you went through the trouble of writing all of this explanation, I hope this is useful to someone else