search

07th-mod / umineko-question

93 stars 9 forks source link

Ep1-2 CGs, high resolution scroll, corrected lighting issues, translated TsuruPettan NND scroll. #40

Closed ReitoKanzaki closed 7 years ago

ReitoKanzaki commented 7 years ago

Episode 1 and Episode 2 major overhaul. Added PS3 CGs. Edited sprites. Implemented high resolution credit scroll.

ItaloKnox commented 7 years ago

Kinda scratching my head here to solve the conflict. Command line is not helping and the Github desktop is a mess.

ReitoKanzaki commented 7 years ago

Yeah, I noticed that last night. I thought I was using a recent version of the script.

ItaloKnox commented 7 years ago

You can use WinMerge to fix it with a most recent version and then commit the change. I'm not really used to merge stuff with the command line so it doesn't seem to work very well.

ReitoKanzaki commented 7 years ago

I used WinMerge and combed through all the diffs. I even found a spot where I forgot to put in clr_oldnew_bg.

DoctorDiablo commented 7 years ago

Man, resolving conflicts in Git is a pain. It's probably easiest to just fix the file outside of Git.

It looks like your branch was based on pull request #28, so if you diff this version of 0.utf with the latest in the master branch and make sure all of those changes are applied in your version, it should resolve the conflict.

Or if you did that already and it's still not resolving the conflict... maybe you should cancel this pull request, pull the latest master version into your branch with a pull request of your own, drop your changes on top of that, and then submit a new pull request so GitHub thinks it was based on the most recent version.