search

redeclipse / maps

Red Eclipse data module for maps included in the game
9 stars 14 forks source link

Updated echo to r1371 #122

Closed dc-redeclipse closed 3 years ago

dc-redeclipse commented 3 years ago
dc-redeclipse commented 3 years ago

I dont know why always these conflicts happend but this zip file is the right content for the merge. echo-r1371.zip

dc-redeclipse commented 3 years ago

just ignore the conflict the newest version is in the zip file just to get it right

Jigoku commented 3 years ago

Did you make sure your local maps repo is in sync with previous changes? Maybe check with:

git checkout dc-de:echo-r1371
git pull upstream master
git reset --hard upstream/master

Then readd/commit your changes for the updated map and;

git push origin dc-de:echo-r1371 --force

That should probably clear up the conflicts.