GitHub: Pulling a branch in another branch

Question

I have a branch (mainbranch) which is recently derived from the master.

If a do a git pull origin otherbranch will that merge the branch otherbranch to the mainbranch derived from master?

Git merge can be used but curious to know what will the above statement do.

What i need is to merge otherbranch with main branch and megre is giving error

fatal: 'otherbranch' does not point to a commit

Koraktor · Accepted Answer · 2012-08-07 08:09:35Z

1

This command is equivalent to

git fetch origin otherbranch git merge FETCH_HEAD

And will therefore:

Fetch the history of the remote branch otherbranch from remote origin (its head commit is temporarily saved in FETCH_HEAD).
Merge the history of origin/otherbranch (which is now in FETCH_HEAD) into the currently checked out branch.

answered Aug 7, 2012 at 8:09

Koraktor

43.2k10 gold badges72 silver badges100 bronze badges

Sign up to request clarification or add additional context in comments.

4 Comments

amitchhajer Over a year ago

so it means in my example, the otherbranch is merged to mainbranch ?

Koraktor Over a year ago

If mainbranch is checked out, yes.

amitchhajer Over a year ago

the branch was not a local, it was branch at github, still ?

Koraktor Over a year ago

Git is always local, fetch/merge (or pull) fetch the history from the remote and do the merge locally. But yes, it was the branch from GitHub (or whatever origin points to).

Collectives™ on Stack Overflow

GitHub: Pulling a branch in another branch

1 Answer 1

4 Comments

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

4 Comments

Related