3 ms·
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 we
by danzanzini 7y ago
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.
- sixstringtheory 7y agoIf resolving the same conflicts over and over again in many commits gets onerous enough to make it worthwhile investing a little time learning another part of git, you can check out git-rerere (Reuse recorded resolution): https://git-scm.com/docs/git-rerere https://git-scm.com/docs/git-rerere
- sam36 7y agoWhat the heck