Resolve git merge conflict

Question

I tried to merge in the new changes made in master branch to my local branch. I ran the following commands:

git checkout feature1
git rebase master

After that I move on to resolve the conflicts during the rebase process.

My question here is in the conflict what does HEAD mean? It means my local branch head right?

Related: https://stackoverflow.com/questions/7901864/git-conflict-markers — jub0bs, Oct 17 '18 at 18:06
Won't close this (yet?) but see https://stackoverflow.com/q/25576415/1256452 — torek, Oct 17 '18 at 18:35

score 3 · Accepted Answer · answered Oct 17 '18 at 18:56

3

HEAD in git is always where you are. You checkout a branch? HEAD points to the tip of the branch. You checkout a revision? HEAD points to that revision.

answered Oct 17 '18 at 18:56

eftshift0

26,375
3
36
60

Resolve git merge conflict

1 Answers1