These are chat archives for BSData/wh40k
1: You got your own rules for your repo, fine for me. But please don't act like I should have informed myself better beforehand. There simply is no information at all about your collaboration rules. Please consider writing that to the readme if they are so important to you.
2: Instead of producing work for you guys I tried to take it away from you. If you don't like that, consider making the repo private. In the end, that's actually what github is for...
Well discard the pull request then, I dont care anymore... It's like 5 mins of your time to merge it correctly and it can't produce any bad conflicts, as i didn't touched any of the uuids (probably the only real reason). To me, this sounds more like you are scared of git, not really understanding how it works properly nor being able to use it correctly.
You could even merge it by hand (meld or sth) into your "conflicting" version in under 10 mins without any problems, lol.