Re:Jenkin developers accidentally do "git push --force" to o...
by encoderer on Monday November 11, 2013 @09:28PM
(#6715494)
It's used often in a team where you each have your own forks. It's much less risky in such a case, of course. Basically, I push to my fork, then later I pull-with-rebase from the mainline, then I push again to my fork. Oops, commit hashes have changed because of my pull-with-rebase. So I need to either push to a different branch or force push.
[ Parent
| on HN ]
Re:Jenkin developers accidentally do "git push --force" to o...
by bad_user on Tuesday November 12, 2013 @12:55AM
(#6716114)
Your problem is that you shouldn't be doing pull with rebase so often. A clean merge doesn't have to rewrite anything.
Re:Jenkin developers accidentally do "git push --force" to o...
by swift on Tuesday November 12, 2013 @11:25AM
(#6718673)
I'm not sure a "problem" exists here. Keeping your personal topic branch rebased on top of the main development branch is a perfectly reasonable workflow, and quite comparable to what you'd do with Mercurial patch queues.
Re:Jenkin developers accidentally do "git push --force" to o...
by mst on Tuesday November 12, 2013 @01:38PM
(#6719823)
And in a team where everybody's used to that, and force is only ever used on topic branches where that's the expected 'done thing', it really doesn't cause a problem.
(on teams that like rebase I tend to do this a lot)