search

LocalGod79 / UrsaPolaris

An Endless Sky post-main-arc universal outfitter station story
GNU General Public License v3.0
20 stars 14 forks source link

Update UPMissions.txt #3

Closed Alkallid closed 8 years ago

Alkallid commented 8 years ago

Did I do it right?

LocalGod79 commented 8 years ago

you need to update your fork - i released an update today, and it's created some conflicts.

Alkallid commented 8 years ago

Oh boy

Alkallid commented 8 years ago

What am I missing, I only needed to fix missions.txt, right? Does it have something to do with I don't even know?

LocalGod79 commented 8 years ago

resolving conflicts like this is pretty difficult in the browser (i don't even know how to do it).

i'm going to see what i can do...

LocalGod79 commented 8 years ago

wow...okay, that didn't work (i tried to take your file and use the github desktop to compare the changes, and it went all wonky - GitHub at its finest)

how much time did you spend on this?

Alkallid commented 8 years ago

4 hours or so.

LocalGod79 commented 8 years ago

would you like to create another commit with your name/chosen handle and some words in the "Special Thanks" section of the ©&credits.txt?

Alkallid commented 8 years ago

Sure? You mean credits and ackowledgements?

Alkallid commented 8 years ago

Name would be Allister Xu.

LocalGod79 commented 8 years ago

done

LocalGod79 commented 8 years ago

fyi, i am removing some of the little bits of personal flavour that you added as i find them - i feel like they change the overall storytelling style that i was using...

LocalGod79 commented 8 years ago

got to the deep mission

i'm reverting your commit

Alkallid commented 8 years ago

Kay

Alkallid commented 8 years ago

That one was especially a joke... I'd have been suprised if yoi left it in.

LocalGod79 commented 8 years ago

the problem was that the changes were so wholesale, i couldn't see them all - github basically showed me "everything deleted, this in place"...

perhaps try doing pulls two or three missions at a time?

Alkallid commented 8 years ago

I'll try next time but I don't think there'll be any more wall-of-texts...

I hope

Alkallid commented 8 years ago

Woah this still exists- would you like me to redo all of this, (lenny not included?)

LocalGod79 commented 8 years ago

if you're willing...

i would say try to do just a mission or two per pull request, so that GitHub can track the changes better, i can better analyze them, and you're not hunched in front of your computer for four hours straight...

Alkallid commented 8 years ago

Please, I got arthritis looong ago.