record conflict resolution steps

Ulrich Scholz 2 months ago 0

In the following situation, I have to repeat manual work. It could be automated:

  • I have a feature branch and merged in develop at some point
  • Merging in develop resulted in conflicts that I resolved
  • Some time later, the feature branch is rebased on the then-latest develop
  • The conflicts I've resolved when merging in develop now appear again and need to be resolved again.

Could the steps to resolve the merge conflicts be recorded and applied again on reabase?

Image 834

Image 835

Conflict Solver