Today's github tip - fixing local master

Daniel Murphy yebblies at nospamgmail.com
Wed Jun 19 17:28:44 PDT 2013


"Dicebot" <public at dicebot.lv> wrote in message 
news:hvntmeabdeljjxfedixi at forum.dlang.org...
> On Wednesday, 19 June 2013 at 12:12:27 UTC, Daniel Murphy wrote:
>> Obviously.  Walter accidentally committed to master, then pulled from
>> upstream creating a bunch of merge commits.  All the branches he made 
>> after
>> this point then contained these extra garbage commits.  It didn't help 
>> that
>> he pushed this mess to origin/master too.  Hard resetting master is the
>> correct solution to this specific problem.
>
> Coorect solution would have been to stop immediately when commit to master 
> was made and delete this commit.

So, you're saying it would be better to not screw things up in the first 
place?  Helpful. 




More information about the Digitalmars-d mailing list