Aw, crap


After working on a private branch for about a week now, I tried to merge with the main and things got super screwed up.  I reverted back to my branch for now.  I guess I’m going to have to splice things in by hand, as the merge tool ruins some of the classes and I can’t find an option to tell it to step off.

-Grant

Advertisements

About A-Type

Sophomore at NC State University, majoring in Computer Science. Hobbyist game programmer.

One response to “Aw, crap”

  1. kmforre4 says :

    Sorry, brother! I’m sure you’ll figure it out, even if it takes you longer than expected. Also-I thoroughly enjoyed the way you wrote this 😛

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Google+ photo

You are commenting using your Google+ account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s

%d bloggers like this: