It looks to me like GP may have commented without reading the article. "Mergers ruin everything" could be misread as "Merges ruin everything". Just reading the title could lead someone to think this was a discussion about git best-practices.
I don't have any good resources off-hand (other than what shows up in a quick search), but my "best practices" are to always squash and keep PRs as small as possible.
When a working branch falls behind main, I prefer to rebase it instead of merging from main to keep it up to date. However, if you've already pushed your working branch to a repo, after rebasing you need to `git push --force` - which is a problem if there are others who have previously cloned the working branch.
zentiggr|4 years ago
oplav|4 years ago
blendergeek|4 years ago
brimstedt|4 years ago
Got any suggestions on the topic?
good-idea|4 years ago
When a working branch falls behind main, I prefer to rebase it instead of merging from main to keep it up to date. However, if you've already pushed your working branch to a repo, after rebasing you need to `git push --force` - which is a problem if there are others who have previously cloned the working branch.