This is how I git

Re:This is how I git by gwenzek on Tuesday November 10, 2020 @07:36AM (#25045265)

The issue is that Git sucks at rebasing. Every conflict you fix when rebasing will need to be fixed again next time you rebase.

[ Parent | on HN ]

Re:This is how I git by mklein994 on Tuesday November 10, 2020 @08:40AM (#25045772)

Enter git rerere: https://git-scm.com/docs/git-rerere

This will "REuse REcorded REsolutions" of conflicted merges.

Once enabled, it will record how a merge conflict was resolved, and replay it back the next time it encounters it. Saves a lot of time in cases where you already solved the merge once before.

https://git-scm.com/book/en/v2/Git-Tools-Rerere

[ Parent | on HN ]

Re:This is how I git by not_kurt_godel on Wednesday November 11, 2020 @12:53AM (#25055875)

rerere gives me nightmares. Much prefer some delicate merging footwork if at all possible.

[ Parent | on HN ]

Re:This is how I git by SassyGrapefruit on Tuesday November 10, 2020 @09:03AM (#25045997)

I can confidently say I've never encountered this. To diagnose I'd have to see what exactly you are doing, but I suspect you have issues with the way you organize your work. Git is not a magic wand. Making effective use of a hammer starts with the boards and nails.

[ Parent | on HN ]

Re:This is how I git by ricardobeat on Tuesday November 10, 2020 @07:38PM (#25054157)

True, it's one of the downsides. You have to also be in the 'short-lived branches' camp for it to work well - which you should!

[ Parent | on HN ]