1

I am working on my branch which I keep merging with the master which works well. But the problem arrives when my pre-checkin pipeline starts by taking my SHA and tries to apply latest SHA from master via rebasing method. This always ends in conflict. This process of rebasing in pre-checkin cannot be changed. Anyway during rebasing conflicts can be avoided?

Hacker
  • 7,798
  • 19
  • 84
  • 154

1 Answers1

0

I am working on my branch which I keep merging with the master which works well.

Ideally, you might want to keep rebasing your branch on top of master, possibly with git rerere active, in order to memorize past conflict resolution (see "Are there any downsides to enabling git rerere?")

That way, when your pre-checkin step does its rebase, that automatic step which cannot be avoided becomes trivial.

VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • But there are many developers who will need to enable the rerere feature on their local. Anything can be done while doing a rebasing? – Hacker Mar 16 '23 at 13:14
  • @Hacker While rebasing: [train your git rerere](https://stackoverflow.com/a/45664714/6309). But yes, rerere is a local setting. – VonC Mar 16 '23 at 13:32