Git – How to apply unmerged upstream pull requests from other forks into the fork

gitgithubpull-request

A project on GitHub that I have a fork of has a new pull requests that I want to pull into my fork that the author has not pulled in yet.

Is there a simple way to apply pull request from other forks into my fork? Is there something else here that I am missing?

Best Answer

Update: Via Webpage

You can also do this via the github webpage.

I assume, you should have already a fork (MyFork) of the common repo (BaseRepo) which has the pending pull request from a fork (OtherFork) you are interested in.

Navigate to the fork (OtherFork) which has initiated the pull request which you like to get into your fork (MyFork)
Go to the pull requests page of OtherFork
Click new pull request
The pending pull request(s) should be offered. Remember to select proper OtherFork branch too. Select on the left side as the base fork your fork (MyFork) (IMPORTANT).
Now the option of View pull request should change to Create pull request. Click this.

Now you should have a pending pull request in your fork (MyFork), which you can simply accept.

Related Solutions

Git – How to selectively merge or pick changes from another branch in Git

I had the exact same problem as mentioned by you above. But I found this clearer in explaining the answer.

Summary:

Check out the path(s) from the branch you want to merge,

 $ git checkout source_branch -- <paths>...

Hint: It also works without `--` like seen in the linked post.

or to selectively merge hunks

 $ git checkout -p source_branch -- <paths>...

Alternatively, use reset and then add with the option -p,

    $ git reset <paths>...
    $ git add -p <paths>...

Finally commit

 $ git commit -m "'Merge' these changes"

Git – Make .gitignore ignore everything except a few files

An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again. If a negated pattern matches, this will override lower precedence patterns sources.

# Ignore everything
*

# But not these files...
!.gitignore
!script.pl
!template.latex
# etc...

# ...even if they are in subdirectories
!*/

# if the files to be tracked are in subdirectories
!*/a/b/file1.txt
!*/a/b/c/*

Best Answer

Update: Via Webpage

Related Solutions

Git – How to selectively merge or pick changes from another branch in Git

Git – Make .gitignore ignore everything except a few files

Related Topic