search

davewx7 / citadel

A turn based strategy game based on the Anura engine
Other
97 stars 25 forks source link

'Missionaria Protectiva' implementation #219

Closed pacnutek closed 6 years ago

pacnutek commented 6 years ago

'Missionaria Protectiva' implementation and enhancement of the Bamboo Forest

ghost commented 6 years ago

GitHub isn't able to handle that as gracefully as Git, so I'm going to perform a classic merge.

pacnutek commented 6 years ago

Hi. Thanks for the merge and comment. I was wondering myself why there where those other revisions attached. I pulled them from upstream 2 minutes before the pull request (did a rebase after that). I thought I finally got git but nope, it still eludes me.

ghost commented 6 years ago

Hi. Thanks for the merge and comment. I was wondering myself why there where those other revisions attached. I pulled them from upstream 2 minutes before the pull request (did a rebase after that). I thought I finally got git but nope, it still eludes me.

Which was the application with which you did the rebase?

pacnutek commented 6 years ago

Git, the bash console under windows.

ghost commented 6 years ago

Git, the bash console under windows.

By the results it's like you did the rebase but amending the commits, or using not a rebase but an interactive rebase and then amending every commit. Or maybe just the first one, this would cause all of the stacking commits on top of it to be amended too.

Maybe it's not late enough as to not be able to dump the history and search for more evidence. But this has important privacy implications.

I probably haven't used recent NTFS versions, but I guess under windows there is still the possibility of accidentally changing file access permissions back and forth.