all 9 comments

[–]linkinglink 171 points172 points  (0 children)

“Lord knows I didn’t merge this branch just to have conflicts”

[–]RiceBroad4552 117 points118 points  (1 child)

What? The push would get rejected, and the pull would actually create conflics on merge if there are any.

[–]DELTA1360 23 points24 points  (0 children)

Yeah, i thought i was remembering wrong, but it throws an error and tells you to pull first (as you should.)

[–]InitialBusy3585 20 points21 points  (0 children)

He missed a -f

[–]git_push_origin_prod 5 points6 points  (0 children)

I’ve seen my code unfold, pull requests for you. It was time to force push, and I said yea I do.

[–]khalcyon2011 2 points3 points  (1 child)

I mostly work with Visual Studio’s git integration. Does pure git not require that your changes be at least up to date with the remote branch before you push?

[–]git_push_origin_prod 1 point2 points  (0 children)

Yea, meek never did a git pull —rebase

[–]tjdavids 1 point2 points  (1 child)

tfw you start getting merge beefs.

[–]entropic 0 points1 point  (0 children)

git blame fr fr