search

simutrans / simutrans-extended

Sources for the Experimental branch of the popular game Simutrans
http://forum.simutrans.com/index.php?board=53.0
Other
3 stars 0 forks source link

Pier system Update #7

Closed PJMack closed 2 years ago

PJMack commented 2 years ago

I have tried three times to fix the merge conflict with github, however every time I press "merge" I receive a "this page is out of date" error.

mariculousNyan commented 2 years ago

This has not been forgotten. I will hopefully catch some time this week to have a look at this.

The reason for the merge trouble is that the base has changed in order to remove the pier system from master, so it can get back in sync with jamespetts/master.

To fix this on your own, you should be able to check out this branch (feature-pier_system), then apply your not yet included commits to that branch.