Merge in GitHub pull requests, possibly making changes to them first

冷暖自知 提交于 2019-12-20 09:35:17

问题


I recently started managing a project on GitHub where people have been submitting pull requests. Rather than merge them to master, I would like the ability to:

  1. First vet them to make sure they actually work

  2. Possibly making some stylistic changes before merging to master

How can I do this?

Do you have to make a separate branch, such as "dev", and instruct people to code against that before you merge to master?


回答1:


There is a github help page on this which details how to make changes to a pull request by checking out pull requests locally.

What I might try is first creating a remote for the pull request submitter (I'm using the examples from the above page):

git remote add kneath git://github.com/kneath/jobs.git

Fetch the changes:

git fetch kneath

Check out the branch in question (ex. master):

git checkout kneath/master

Vet them however you like, since the code that will be there will be the pull request code. Run tests, etc.

Merge them in if you're good to go:

git checkout master
git merge kneath/master

Further, here is a very good page on git project management workflows which details the various workflows one can take on collaboration integration.




回答2:


A faster way of doing things with GitHub is to use this GitHub feature presented by Zach Holman in his GitHub Secrets II Talk (video).

git fetch origin pull/id/head:name

Where id is the pull request id, head is the remote branch (on the fork), and name is the name you want to give the local branch. For example:

git fetch origin pull/12/head:pr

Fetches pull request #12 into a branch named pr.

You can add this as an alias in git if you use this a lot.



来源:https://stackoverflow.com/questions/6474942/merge-in-github-pull-requests-possibly-making-changes-to-them-first

易学教程内所有资源均来自网络或用户发布的内容,如有违反法律规定的内容欢迎反馈
该文章没有解决你所遇到的问题?点击提问,说说你的问题,让更多的人一起探讨吧!