GIT: How to copy contents of one branch to other branch?

后端 未结 4 1592
情话喂你
情话喂你 2021-01-31 09:50

I have \'develop\' and \'InitialPomChanges\' branches. I want to copy all the contents of develop branch to InitialPomChanges branch.

4条回答
  •  暗喜
    暗喜 (楼主)
    2021-01-31 10:37

    Assuming you want to overwrite all the contents of InitialPomChanges with what is in develop (i.e. you want the contents of InitialPomChanges to exactly match develop), do the following:

    git checkout InitialPomChanges
    git checkout develop .  #copies the contents of develop into the working directory
    git commit -am "Making InitialPomChanges match develop"
    

    This will make the last commit in InitialPomChanges match the last commit in develop. To make future merges between the two branches easier, it would be a good idea to now do a git merge develop.

    Alternatively, if you want to change the contents of InitialPomChanges and do the merge in one single commit, you can do:

    git checkout InitialPomChanges
    git merge -s theirs develop
    

提交回复
热议问题