danzanzini
Using Spec-Driven Development to Build Consistent APIs
Re:Git Tricks: Avoiding merge when dealing with remote conflicts
on Monday October 21, 2019 @08:18PM (#21319054)
The conflicts from a later time happens because rebase applies one commit at a time.
If you solve a conflict from your first commit by applying changes that were made only in the later ones, you'll need to solve this same conflict again and again.