CODEWITHSUNDEEP
gitgit-merge
Yinfang Zhuang
Yinfang Zhuang

Reputation: 451

Resolve git merge conflict

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?

Upvotes: 0

Views: 120

Answers (1)

eftshift0
eftshift0

Reputation: 30156

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.

Upvotes: 3

Related Questions