git/FETCH_HEADĪ0bd3f25167d0ded0498dcad4db7a3c54cbee1e2 branch 'new_design' of :zzzlo/thingie_driver_appĮeae3dc6ea7f4ada8ab9b759c375cfb7c5b2723c not-for-merge branch 'master' of :zzzlo/thingie_driver_app (showing git's awareness of what branch is to be merged in): cat. However if I run git fetchĪgain (but from this branch) and inspect the FETCH_HEAD, I get slightly different output If I switch to the branch new_design, I get the same output. Not-for-merge means these will not be merged (here because the local master is up-to-date with the remote master) Git pull then uses git merge to merge FETCH_HEAD into the localĮeae3dc6ea7f4ada8ab9b759c375cfb7c5b2723c branch 'master' of :zzzlo/thingie_driver_appĪ0bd3f25167d0ded0498dcad4db7a3c54cbee1e2 not-for-merge branch 'new_design' of :zzzlo/thingie_driver_appĦ2e159f46933793b99643a392c4d7a70d3178cb0 not-for-merge branch 'new_flow' of :zzzlo/thingie_driver_app You do a git pull, internally it does a fetch and sets FETCH_HEAD to the tip of This is an (often changing) reference to what has just been fetched from remote. Point with: $ git reset -hard ORIG_HEAD What is FETCH_HEAD? That's what HEAD was before a rebase/merge or reset started. this willīecome the parent of your next commit (if you stay in that branch). Specifically what you last checked out in your working directory.

git/HEAD gives an SHA instead of a reference to a file containingĮach branch has a named head, and the HEAD will be pointed to one of these. When HEAD points to a commit that is not the last in a branch. But this denies the existence of a detached head. Points to the file corresponding to the current branch - which itself points toĪn SHA. Detached headĪt first it seems (wrongly, it will turn out), that HEAD is a pointer that

git/refs/heads/masterįYI: HEAD will be different for each developer, i.e. What is the ref/heads/master? Just another file, this time one thatĬontains an actual SHA: $ cat. # This ref has changed to reflect the branch name. Watch what happens when I change to the master branch (I was on the # FYI: refactor_types was the name of the branch I was on at this time. Then looking inside on of these ALL CAPS files: $ cat HEAD There is useful information available by inspecting the ALL_CAPS filenames in the. This usually means it's time for you to push. This means you have commits locally that are ahead of (your computer's) view of The general case for 'your branch is ahead of origin/master' Origin/master by X commits' and this persisted rather stubbornly. Now, the other people's git instances had issues like 'your branch is ahead of Moving HEAD back to before this change then force pushing this to GitHub.

Person's recent changes, then pushed this out. At work, someone resolved a merge conflict in a way that clobbered another

Git checkout remote branch