Branching version control was definitely a “they have played us for absolute fools” moment. Especially after all our projects ended up as isolated branches on isolated microservice repositories so basically none of our code was being integrated, let alone continuously. Good for full-remote open source projects where a central admin team has to police submissions though.

Doesn’t git status tell you what to do?

use “git add <file>…” to mark resolution

use “git commit” to conclude merge

I always use git status to check what is appropriate before doing anything else, since the right thing to do can sometimes be different, like after using git rebase when a break command was used vs when a squash command resulted in a conflict.

git push --force

IN CASE OF FIRE:

1. git commit
2. git push
3. exit building