Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple people working on unaccepted pull request #7

Open
yashsriv opened this issue Aug 29, 2016 · 2 comments
Open

Multiple people working on unaccepted pull request #7

yashsriv opened this issue Aug 29, 2016 · 2 comments

Comments

@yashsriv
Copy link
Contributor

Someone else has worked upon my server and created its frontend.....so how should we send its pull request??

Should I just merge it into my own branch and let the PR be updated?

@sakshamsharma
Copy link
Member

sakshamsharma commented Aug 29, 2016

I believe the person who has worked upon your Pull Request should be merging your branch into his code. Since there will be many such clashes, I believe it would be good if we follow the merge way of maintaining a repo, instead of the rebase way. In that scenario, a person who builds upon another's code can merge the other person's code into his branch/fork. When his PR is accepted, the other PR (in this case, yours) would automatically become at par with master, and thus would be finished as well. We can comment on that PR to keep track of changes which were merged in some other PR.
@pallavagarwal07 please take a decision. @harshnarang8 Please keep yourself updated with this issue. We may ask you to update your branch soon (don't do it now)

@yashsriv
Copy link
Contributor Author

@sakshamsharma Currently I have done it the other way round...... I have included his changes into my branch and updated the PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants