Realizing I had a detached head without realizing how I managed to get it (like three commits absent), I also discovered that trying to merge, rebase or cherry-pick triggered numerous merge-conflicts, so I took another solution: As I explained in @ralphtheninja's response, git checkout path/to/foo could conflict with git checkout https://copyright-website52692.ssnblog.com/37496679/how-connect-with-copyright-members-on-facebook-can-save-you-time-stress-and-money