On 21 August 2015 at 11:44, Ramana Radhakrishnan wrote: >> >> Absolutely, a non-fast-forward push is anathema for anything other people >> might be working on. The git repository already prohibits this; people that >> want to push-rebase-push their own branches need to delete the branch before >> pushing again. > > On the FSF trunk and the main release branches - I agree this is a > complete no-no. > > A push-rebase-push development model is possible / may be useful when > the developers collaborating on that branch agree on that model.
Teams following a different model could use a separate repo shared by those developers, not the gcc.gnu.org one. It's much easier to do that with git. > Given current practice of merging development branches into mainline > being effectively a "rebase" which allows for the linear history on > mainline to be retained, we should document very clearly how git merge > should be used on mainline from development branches. Yes, definitely.