Re:Linus’s rules on keeping Git history clean (2009)
by doubleunplussed on Thursday September 05, 2019 @08:14AM
(#20885854)
Does this mean you can't have merge commits in feature branches?
And what about maintaining a release branch? There are good reasons to be merging in both directions sometimes, even if you never commit directly to master.
In our repos, we allow neither, so all non-merge commits are, by definition, on a feature branch on the right-hand-side.
I guess one person's hacky convention is another's primary workflow. ¯\_(ツ)_/¯