Re: [Mutopia-discuss] git advice: remove a merge
I _guess_ that Github compares all the history of your branch with all the history of upstream and find any merge commit. The easiest and quickest way is starting from scratch, so you are sure that the master branch in your fork is clean. Il giorno mer 14 mag 2014 alle 21:37, Knute Snortum ha scritto: I have done a git reset --hard on my local repository. Then I setup one branch and one file to commit. I pushed this out to my GitHub repository. When I try to do a pull request, I get nine commits (from when I was merging back to the master branch) and four files. I only need two commits and one file. I haven't done GitHub pull requests before so I may be doing something wrong. It seems to me that my GitHub repository still sees the commits to master as changes that need to be in the pull request. How can I clean out my GitHub repository? Or, how do I get a pull request that has only the changes I want in it? Knute Snortum (via Gmail) On Wed, May 14, 2014 at 11:34 AM, Knute Snortum wrote: I have pulled out all the ly files I have been working on and stowed them. I'll put them back one by one when my repository is clean. Then hopefully I will be able to create clean pull requests. BTW, I found out how to delete a pull request: close it first. I had assumed "Close" meant the comments. Knute Snortum (via Gmail) On Wed, May 14, 2014 at 11:30 AM, Glen Larsen wrote: On Wed, May 14, 2014 at 11:23 AM, Knute Snortum wrote: Thanks Felix, I'll try that. If I can close a pull request, I don't see how to on GitHub. I may just be missing it, though. If anyone knows how to do it, please tell me. Closing is a product of merging the pull request. I believe if you delete the branch of the pull request in your remote fork it will effectively cancel/remove the pull request. I am assuming you still have the topic branch in your local repository! ___ Mutopia-discuss mailing list Mutopia-discuss@mutopiaproject.org http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss
Re: [Mutopia-discuss] git advice: remove a merge
I have done a git reset --hard on my local repository. Then I setup one branch and one file to commit. I pushed this out to my GitHub repository. When I try to do a pull request, I get nine commits (from when I was merging back to the master branch) and four files. I only need two commits and one file. I haven't done GitHub pull requests before so I may be doing something wrong. It seems to me that my GitHub repository still sees the commits to master as changes that need to be in the pull request. How can I clean out my GitHub repository? Or, how do I get a pull request that has only the changes I want in it? Knute Snortum (via Gmail) On Wed, May 14, 2014 at 11:34 AM, Knute Snortum wrote: > I have pulled out all the ly files I have been working on and stowed them. > I'll put them back one by one when my repository is clean. Then hopefully > I will be able to create clean pull requests. > > BTW, I found out how to delete a pull request: close it first. I had > assumed "Close" meant the comments. > > > Knute Snortum > (via Gmail) > > > On Wed, May 14, 2014 at 11:30 AM, Glen Larsen wrote: > >> >> >> On Wed, May 14, 2014 at 11:23 AM, Knute Snortum wrote: >> >>> Thanks Felix, I'll try that. >>> >>> If I can close a pull request, I don't see how to on GitHub. I may just >>> be missing it, though. If anyone knows how to do it, please tell me. >>> >> >> Closing is a product of merging the pull request. I believe if you delete >> the branch of the pull request in your remote fork it will effectively >> cancel/remove the pull request. >> >> I am assuming you still have the topic branch in your local repository! >> >> >> > ___ Mutopia-discuss mailing list Mutopia-discuss@mutopiaproject.org http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss
Re: [Mutopia-discuss] git advice: remove a merge
I have pulled out all the ly files I have been working on and stowed them. I'll put them back one by one when my repository is clean. Then hopefully I will be able to create clean pull requests. BTW, I found out how to delete a pull request: close it first. I had assumed "Close" meant the comments. Knute Snortum (via Gmail) On Wed, May 14, 2014 at 11:30 AM, Glen Larsen wrote: > > > On Wed, May 14, 2014 at 11:23 AM, Knute Snortum wrote: > >> Thanks Felix, I'll try that. >> >> If I can close a pull request, I don't see how to on GitHub. I may just >> be missing it, though. If anyone knows how to do it, please tell me. >> > > Closing is a product of merging the pull request. I believe if you delete > the branch of the pull request in your remote fork it will effectively > cancel/remove the pull request. > > I am assuming you still have the topic branch in your local repository! > > > ___ Mutopia-discuss mailing list Mutopia-discuss@mutopiaproject.org http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss
Re: [Mutopia-discuss] git advice: remove a merge
On Wed, May 14, 2014 at 11:23 AM, Knute Snortum wrote: > Thanks Felix, I'll try that. > > If I can close a pull request, I don't see how to on GitHub. I may just > be missing it, though. If anyone knows how to do it, please tell me. > Closing is a product of merging the pull request. I believe if you delete the branch of the pull request in your remote fork it will effectively cancel/remove the pull request. I am assuming you still have the topic branch in your local repository! ___ Mutopia-discuss mailing list Mutopia-discuss@mutopiaproject.org http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss
Re: [Mutopia-discuss] git advice: remove a merge
Thanks Felix, I'll try that. If I can close a pull request, I don't see how to on GitHub. I may just be missing it, though. If anyone knows how to do it, please tell me. Knute Snortum (via Gmail) On Wed, May 14, 2014 at 11:00 AM, Felix Janda wrote: > git reset --hard should be able to fix up your master. Then make > new topic branches and git-cherry-pick your work into them. Then make > new pull-requests and close the old ones. (Can you really not do this > yourself? If not you could still add a comment to the pull-request.) > > Felix > ___ Mutopia-discuss mailing list Mutopia-discuss@mutopiaproject.org http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss
Re: [Mutopia-discuss] git advice: remove a merge
git reset --hard should be able to fix up your master. Then make new topic branches and git-cherry-pick your work into them. Then make new pull-requests and close the old ones. (Can you really not do this yourself? If not you could still add a comment to the pull-request.) Felix ___ Mutopia-discuss mailing list Mutopia-discuss@mutopiaproject.org http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss
[Mutopia-discuss] git advice: remove a merge
Do we have any git experts here? I merged a topic branch to master, which I now know not to do. But this merge shows up on all of my pull requests. How do I back out the merge and make the pull requests clean? git revert doesn't seem like the right thing, because it creates commits rather than removing them. git rebase doesn't seem right either because again, it resets the head, but then replays all the commits after that. Any ideas? Knute Snortum (via Gmail) ___ Mutopia-discuss mailing list Mutopia-discuss@mutopiaproject.org http://lists.bcn.mythic-beasts.com/mailman/listinfo/mutopia-discuss
