Re:Extremely Linear Git History
by BiteCode_dev on Tuesday November 22, 2022 @08:58AM
(#33705819)
This work if you have only experienced professional developpers in the team. If you have juniors or non devs (mathematicians, geographers, qwants...) that just happen to also code, rebase is a minefield. This is espacially true in open source contributions.
[ Parent
| on HN ]
Merge and conflict resolution is a minefield if unexperienced developers do it too. Fortunately it can (often) be arranged that those with some understanding of the issues involved can do the resolution.
you get the same, and often more, conflicts using rebase
Always clone to another folder before merging ;)
If you can’t rebase, I don’t want you pushing to my main branches. I would rather teach everyone how to rebase before I cave and allow merge commits.
Re:Extremely Linear Git History
by BiteCode_dev on Tuesday November 22, 2022 @09:36AM
(#33706225)
In a perfect world with infinite resources and no time constraints, sure.
I've done several projects rebase-only with limited resources and time constraints. In fact, it saved resources and time when we did it.
You have been repaid the time investment spent learning rebase commands, after once being able to avoid a really bad merge conflict.