Merge git repo into branch of another repo

后端 未结 3 1627
借酒劲吻你
借酒劲吻你 2020-12-04 05:06

Given repo Foo and repo Bar. I want to merge Bar with Foo, but only into a separate branch, called baz.

git checkout -b baz <=

3条回答
  •  忘掉有多难
    2020-12-04 05:22

    Using the guide from larsks, I was able to do this using SourceTree.

    1. Created a branch in the destination repository
    2. Added the source repository as a remote, by hitting the Settings button and adding the source repository.
    3. Branches from both repository now show in the branch list. I used the merge tool to merge a branch from the source repository to my new destination repository's branch.
    4. Resolved any conflicts using either SourceTree or my IDE
    5. Commit the changes in my branch.
    6. Remove the source repository from the remote list, by using the Settings button.

提交回复
热议问题