Yeah learned this the hard way.

you are viewing a single comment's thread
view the rest of the comments
[–] 1 point 1 year ago* (2 children)

In my cases I has to solve same code conflicts multiple times during a rebase, so I just don't try them when hit with conflicts.

I fail to see the benefits of "clean" git history

  • source
  • parent
  • hideshow 2 child comments
  • [–] 1 point 1 year ago (1 child)

    In my cases I has to solve same code conflicts multiple times during a rebase, so I just don’t try them when hit with conflicts.

    Yeah if you have two branches, both with a bunch of commits which all modify the same areas of code, and reordering the commits doesn't help, I can see how it is easier to merge.

    I fail to see the benefits of “clean” git history

    Well, if the commit history is clean and mostly linear, it's much easier to read, understand and review. git blame will also be much nicer which is really important for debugging big codebases. Of course it's a tradeoff, as usual.

  • source
  • parent
  • hideshow 1 child comment