search

LuxArdens / Stellaris---RPG-Traits-mod

Stellaris mod: RPG Traits
MIT License
11 stars 9 forks source link

Meta - random Github rubbish in code #24

Closed LuxArdens closed 6 years ago

LuxArdens commented 6 years ago

Github seems to insert stuff like "<<<<<<< HEAD" into the code whenever a merge takes place. Do you know what causes that and how to prevent it?

TvoEx commented 6 years ago

May have something to do with the fact that Github thinks this is AMPL code.

LuxArdens commented 6 years ago

Wut. How? Why? Where do you see that?

TvoEx commented 6 years ago

Click on your profile and look at your repos, it will probably say this is an AMPL repository

The headers may be completely unrelated, just a random thought.

KaySackey commented 6 years ago

If you merge via the web interface and elect to ignore conflicts then you will see this.

LuxArdens commented 6 years ago

Ah, so it's my fault then. Cheers!