Re:Git 2.0 changes push default to ‘simple’
by Hovertruck on Sunday November 03, 2013 @12:17AM
(#6662208)
I tend to treat the history of the master branch as immutable. Working with a remote branch that needs to stay up-to-date with master has, in my experience, required rebasing and force-pushing the branch.
Re:Git 2.0 changes push default to ‘simple’
by pseut on Sunday November 03, 2013 @12:25AM
(#6662223)
In this case, the person probably thought he or she was pushing "feature-wip" or something similar after cleaning up that branch's history. Not necessarily unreasonable. If master is out of date then
git push -f
throws away any remote commits (under old behavior).
And that's also unreasonable. Pushed history should be treated as immutable. If you broke the build, push a revert commit, fix the issue, and resubmit. And then fix your tooling to recognize rollbacks.