News for hackers. Stuff that matters.

A comment on Git Tricks: Avoiding merge when dealing with remote conflicts. Parent comment

Re:Git Tricks: Avoiding merge when dealing with remote confl... by danzanzini 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.

[ Parent | on HN ]
Re:Git Tricks: Avoiding merge when dealing with remote confl... by sixstringtheory on Monday October 21, 2019 @08:27PM (#21319122)
If 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
[ Parent | on HN ]
Re:Git Tricks: Avoiding merge when dealing with remote confl... by sam36 on Monday October 21, 2019 @09:27PM (#21319482)
What the heck
[ Parent | on HN ]