如何从现有的远程分支创建本地分支？

我想从现有的远程分支(假设是 remote-A)创建一个分支，然后将更改提交到存储库。

我已经使用下面的命令从现有的 remote-A 创建了一个本地分支

$git checkout remote-A


git branch
master
* remote-A

现在我已经使用下面的命令从远程 A 创建了 local-B

git branch local-B
git checkout local-B

如何确保对 local-B 的更改位于 remote-A 之上，以便当我将 local-B 推到远程回购时，更改位于 remote-A 之上？

193391 次浏览
小开

To make sure your changes are on top, you must not pull from remote. you must fetch and rebase. il will be something like this: 

fetch->stash->rebase->stash pop->commit->push
小开
最佳答案

you want to create branch on base of remote-A, make changes on it and then push them on remote-A?

git checkout -b remote-A
git pull origin remote-A
git checkout -b remote-B

make changes on remote-B

 git commit -a -m 'describe changes on remote-B branch'


git checkout remote-A
git merge remote-B
git push origin remote-A
小开

Old post, still I'd like to add what I do.

1. git remote add <remote_name> <repo_url>
2. git fetch <remote_name>
3. git checkout -b <new_branch_name> <remote_name>/<remote_branch_name>

This series of commands will

  1. create a new remote,
  2. fetch it into your local so your local git knows about its branches and all,
  3. create a new branch from the remote branch and checkout to that.

Now if you want to publish this new local branch to your remote and set the upstream url also

git push origin +<new_branch_name>

Also, if only taking in remote changes was your requirement and remote already exists in your local, you could have done, instead of step 2 and 3,

git pull --rebase <remote_name> <remote_branch_name>

and then opted for git mergetool (needs configurations separately) in case of any conflicts, and follow console instructions from git.

小开

This should work:

git checkout --track origin/<REMOTE_BRANCH_NAE>

小开

I wanted to create a new local tracking branch from a remote git branch with a different name.

So I used this command:

git checkout -b <new_branch_name> --track <remote_name>/<remote_branch_name>

Example:

git checkout -b local-A --track origin/remote-A

I saw it in multiple comments to the above answers, but it's good to have it in the first sight.

Tracking branches are local branches that have a direct relationship to a remote branch. If you're on a tracking branch and type git pull, Git automatically knows which server to fetch from and which branch to merge in.

小开

First we need to fetch the remote branch using

git fetch origin <remote-branch>

Then just create a new local branch to track the remote branch

git checkout -b <local-branch> origin/<remote-branch>

Replace origin with your remote name.

小开

First download all your remote branches by :

git fetch

then create a local branch from it:

git checkout -b local_branch_name origin/remote_branch_name

提交答案