GIT in time A live demo on how to: solve git conflict use git restore use git restore --staged use git commit --amend use git checkout use git revert use git reset --hard This is better. I do agree with myself. Zamua