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

___
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

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 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

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 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

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 comments.


Knute Snortum
(via Gmail)


On Wed, May 14, 2014 at 11:30 AM, Glen Larsen glenl@gmail.com wrote:



 On Wed, May 14, 2014 at 11:23 AM, Knute Snortum ksnor...@gmail.comwrote:

 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