Re: Branches in Emacs Git repo

[phillip.lord@russet.org.uk (Phillip Lord)]

Marcin Borkowski <mbork@mbork.pl> writes:
> since I'm planning to start contributing to Emacs, and I don't want to
> break something, I'd like to learn which branches are exactly for what
> and what should I do (assuming I will get write access at some point) -
> for instance, should I create small branches for my patches?  Should
> they be branched from master?


I don't think that there are many rules about branches that are not main
branches, as it were. I've certainly made branches for smallish
features. I generally follow the "gitflow" convention with
"feature/my-new-feature" or "fix/my-fix", but this is just me. I think
very few other people do this. If I remember correctly, it's not
possible to force push, so you can't squash feature branches (remotely).

In general, branch from where ever you expect to merge to. Currently,
this means Emacs-25 iff it's a bug fix, master if it's a new feature.

Phil