Conversation
|
Not to be a jerk, but the way you are merging my changes loses the history that shows me as the committer. If you need to create personal branches to test pull requests that's fine, but you should merge the original pull request once approved to keep the proper committer history. |
|
Actually I was just thinking about that and was considering posting a comment. Agreed, credit should be given to the author wherever possible. If nothing else, this helps link commits to the associated discussion. Briefly, these are the issues that come to mind that should be addressed if you want your own changes to be merged:
|
|
You should be able to merge any pull request into any branch locally: https://help.github.com/articles/checking-out-pull-requests-locally/ it seems straight forward, but I haven't tried it myself. For the file dates/readme, you could just mention it in the PR comments, or submit a PR onto their repository branch. essentially you'd fork them, checkout their PR branch, and commit, then submit a PR to them. That seems like a lot more work than just having them push a new version into their PR though. I think since you are now using the github release section, it's not a bad thing to modify the README or file versions outside of the initial PR. It could even be done as part of the release process instead of as the commit process. |
|
Looking close at the article I linked, that should do exactly what you want. It will give you all the commits from the original committer, than on top of that you can update the README or file versions in your own commit. You then push to a new branch like you've been doing and create a new PR off of your branch. The main difference is that the history is maintained. |
|
As an exercise, will work through the steps of using the original pull request. If successful, the changes will be merged on that branch. |
Completed unit tests successfully. Leaving this pull request open for comment.for a few days.