Found out today that git, bless its heart, has non-symmetric
[badger@Clingman bugzilla]$ git pull
[badger@Clingman bugzilla]$ git push
Counting objects: 7, done.
Compressing objects: 100% (4/4), done.
Writing objects: 100% (4/4), 418 bytes, done.
Total 4 (delta 3), reused 0 (delta 0)
c387d20..ef6bb9c master -> master
! [rejected] 0.5 -> 0.5 (non-fast forward)
error: failed to push some refs to
After a bunch of head scratching we finally realized that
pull only updates a single branch whereas push attempts to
update them all. Horrible UI. Imagine the case where
you're sharing dozens of feature branches with other
developers. Before you push new work you have to git pull
in each of them?