[Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Knute Snortum
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

Re: [Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Felix Janda
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

Re: [Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Knute Snortum
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 felix.ja...@posteo.de wrote: git reset --hard

Re: [Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Glen Larsen
On Wed, May 14, 2014 at 11:23 AM, Knute Snortum ksnor...@gmail.com 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

Re: [Mutopia-discuss] git advice: remove a merge

2014-05-14 Thread Knute Snortum
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