hold off committing for a bit?

[Jonathan "Duke" Leto]

Howdy,

What happened that required all this?

Duke

On Mon, Jul 18, 2011 at 10:22 AM, Brian Gernhardt
<brian.gernhardt at mail.rit.edu> wrote:
>
> On Jul 18, 2011, at 1:14 PM, Will Coleda wrote:
>
>> We might have to rewind history to undo kid51's last commit.
>> Discussion going on in #parrot right now...
>
> I rewound it and applied a cherry pick of the actual commit.  Unless you happened to pull in the last few minutes, you shouldn't notice any changes.
>
> If you did pull while kid51's merge was master, then you may have to do a couple things.
>
> If you did not have any of your own commits on master just `git reset --hard origin/master`
>
> If you did have commits on master, and git tried to merge the new history on top of it:
>
> $ git branch old_master
> $ git reset --hard origin/master
> $ git log old_master # Find the SHA1 of the last commit you added
> $ git merge <your commit>
> $ git branch -D old_master
>
> If I got something wrong in the above sequence, or you need more details I'm willing to provide assistance on #parrot or via e-mail.
>
> ~~ Brian G
> _______________________________________________
> http://lists.parrot.org/mailman/listinfo/parrot-dev
>



-- 
Jonathan "Duke" Leto <jonathan at leto.net>
Leto Labs LLC
209.691.DUKE // http://labs.leto.net
NOTE: Personal email is only checked twice a day at 10am/2pm PST,
please call/text for time-sensitive matters.