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?
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.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.