Re:Key Git Concepts Explained the Hard Way
by ilammy on Wednesday March 14, 2018 @03:49PM
(#16587701)
Fixed this for you:
git commit -a -m "Commit" && git push || ( git push --force; echo "Bob, my git is weird again, could you please help?" > /run/slack/dm/bob-the-local-git-expert )
Obviously, you do this from master.
Re:Key Git Concepts Explained the Hard Way
by hnrodey on Thursday March 15, 2018 @12:33AM
(#16590416)
Until you actually need
git add . && git commit -m "message" && git push <remote> <branch>
Re:Key Git Concepts Explained the Hard Way
by zwischenzug on Wednesday March 14, 2018 @03:22PM
(#16587530)
Sure, but it's the 10% that hurts!
Re:Key Git Concepts Explained the Hard Way
by jameshart on Wednesday March 14, 2018 @03:36PM
(#16587619)
The other 10% of the time:
git commit -a -m "Commit" && git push -f
Re:Key Git Concepts Explained the Hard Way
by saagarjha on Wednesday March 14, 2018 @03:50PM
(#16587707)
Forcing your coworkers do deal with your incompetence, I see.
Re:Key Git Concepts Explained the Hard Way
by jameshart on Wednesday March 14, 2018 @05:20PM
(#16588398)
Since the OP never mentioned a need to use 'git pull', I assume the 10% of the time it didn't work was when other people had gone and corrupted the repository by pushing their own commits. Clearly that's not something we want to have to deal with.
90% of the time, all you need :)