News for hackers. Stuff that matters.

A comment on Stop cherry-picking, start merging, Part 1: The merge conflict. Parent comment

Re:Stop cherry-picking, start merging, Part 1: The merge con... by IshKebab on Tuesday October 16, 2018 @03:27AM (#18227366)
Not necessarily. That only happens if you also squash your branch first.

Most people do that though because they don't want potentially unbuildable commits on master. And the value of keeping around WIP commits from a feature branch is questionable.

[ Parent | on HN ]
Re:Stop cherry-picking, start merging, Part 1: The merge con... by de_watcher on Tuesday October 16, 2018 @03:39AM (#18227428)
Feature branch has to be a sequence of buildable commits that explain the feature.
[ Parent | on HN ]