4 ms·

huh, shouldn't solving the conflict to pr2 create a merge commit that then also solves the conflict in 3 and 4?

• travisb 4y ago
  It sounds like the OP might be using a rebase workflow. Such a workflow creates many repetitive conflicts because there is no merge commit to record the resolution point. Using a rebase workflow with stacked/cascaded PRs is an anti-pattern that trips up people used to other git workflows where the history depth is effectively only one level deep instead of arbitrarily deep as in stacked/cascaded PRs.
  • xerxes901 4y ago
    I think this is something git rerere is supposed to help with
  • anderskaseorg 4y ago
    You can tell git what the resolution point is using `git rebase --onto`. This can help avoid situations where Git gives extra conflicts form trying to reapply an old version of your change on top of a new version of the same change. You can also use `git rebase --skip` if you recognize that you’ve ended up in this situation.