Re:Jenkin developers accidentally do "git push --force" to o...
by aragot on Monday November 11, 2013 @06:28PM
(#6714843)
All the examples you provide are right, because they happen seldomly. Unfortunately, in git, --force is part on the everyday workflow.
[ Parent
| on HN ]
Re:Jenkin developers accidentally do "git push --force" to o...
by sitharus on Monday November 11, 2013 @06:54PM
(#6714938)
What sort of workflow are you using when you need to use --force every day?
The company I work for has at least 50 projects all using Git and the only time we use --force is when we have to clean up a major mistake (eg a premature merge to release). I can count the number of times this has happened in the past 3 years on my hands.
Re:Jenkin developers accidentally do "git push --force" to o...
by jarrett on Monday November 11, 2013 @08:18PM
(#6715254)
I had no idea people were using --force daily. I've been using Git for all my version control since 2008, and I don't think I've ever used --force.
Now I'm curious: How does it fit into people's everyday workflow?
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.
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)
Re:Jenkin developers accidentally do "git push --force" to o...
by encoderer on Tuesday November 12, 2013 @02:41PM
(#6720356)
Exactly. Though it is a bit of a moral hazard... or maybe that's not the right term... point is, users get used to "-f" ing pushes.
Re:Jenkin developers accidentally do "git push --force" to o...
by encoderer on Tuesday November 12, 2013 @01:03PM
(#6719489)
Agree with Swift. Having a rebase strategy keeps history linear and MUCH easier to read.
Re:Jenkin developers accidentally do "git push --force" to o...
by nickstinemates on Monday November 11, 2013 @09:14PM
(#6715449)
I use it when cleaning up pull requests.
Rebase and squash. Fix commit messages. Force push to PR-branch tidy.
Re:Jenkin developers accidentally do "git push --force" to o...
by phaemon on Tuesday November 12, 2013 @04:29AM
(#6716722)
Why would you do this, rather than pull into a different branch name, fix it there, and then merge it in? Is there an advantage to doing it by altering your own repo?
Re:Jenkin developers accidentally do "git push --force" to o...
by nickstinemates on Tuesday November 12, 2013 @05:37AM
(#6716973)
I am talking about editing history and squashing commits. For cleaner merges.
Re:Jenkin developers accidentally do "git push --force" to o...
by lmm on Tuesday November 12, 2013 @10:09AM
(#6718206)
Yes, but you can pull into a new local branch, do the history edit there, and then push that new branch, can't you? Not that I'm sure it would be worth it.
Re:Jenkin developers accidentally do "git push --force" to o...
by gcb1 on Tuesday November 12, 2013 @06:07AM
(#6717062)
But you should do that locally and then push without force.
Re:Jenkin developers accidentally do "git push --force" to o...
by swift on Tuesday November 12, 2013 @11:28AM
(#6718706)
If you're working in an organization that employs pre-merge code review, you may have to modify your topic branch several times before it's ready to be merged into the main development branch. Creating a new branch every time so that you can push without force seems pointless in this case and increases confusion for everyone involved in the process.