merge two works that have been done simultaneously on the same branch
/!\ Try to avoid this situation: each user works on its dedicated branches.
I work on the same branch on two distinct machines. I commit on one and work on the other. This leads me to some complex behaviors...
i used :
git push git rebase --continue git pull --rebase --autostash git push --force-with-lease
git reset
what does git reset do and git reset --hard HEAD
git clean -fd
git fetch git fetch --all
git diff <commit> [file]
git blame
https://www.datacamp.com/tutorial/git-reset-revert-tutorial https://stackoverflow.com/questions/70627750/git-merge-fast-forward-vs-git-rebase https://graphite.dev/guides/resolve-git-rebase-error https://chatgpt.com/c/670fdd88-1a60-8012-adba-e21e604bc186 https://www.atlassian.com/git/tutorials/inspecting-a-repository/git-blame