How do I make two branches identical?
The 3 main ways to make two branches identical: Abandon branch A , make a new A2 , and use that. Use git reset or equivalent to re-point A elsewhere. Methods 1 and 2 are effectively the same in the long run. Make a merge, using a special strategy (see “alternative merge strategies” below).