Protection from merge commits
Bruno Wolff III
bruno at wolff.to
Thu Sep 12 14:49:15 UTC 2013
On Thu, Sep 12, 2013 at 10:37:44 +0100,
David Howells <dhowells at redhat.com> wrote:
>I presume that that would prevent valid merging between branches in the repo?
>For example, I have a reasonably simple package that I apply patches to in the
>master branch and then merge everything back into the last few Fedora version
>branches. Usually merge just fast-forwards the branch, but occasionally there
>has been a mass-rebuild that threw an extra commit in that then needs dealing
>with. I presume I would then need to pick all the commits instead?
I think in that case you'd do a rebase.
More information about the devel