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 (3 children)

That's a good explanation of what it's supposed to do. That was how I understood it as well.

But anytime I've tried it, I've ended up with conflicts where there shouldn't be (like, I already solved that conflict when I merged earlier) and/or completely undesirable results in the end (for instance, some of my changes are just NOT in the result).

So I just gave up on the whole feature. Simpler to just merge the source branch into mine.

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

    Depending on how structured your commits have been, it can either be very difficult to get a rebase through or a complete breeze. There are some features to make it easier - rerere being the main one I'm thinking about.

  • source
  • parent
  • hideshow 2 child comments