widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

The branch is merged and tested on alpha. I had some problems because of permission on the alpha site which i solved. There was a unknown conflict (unknown because i couldn't find any description to this conflict):

conflicts:
  Conflict adding file media/wlmaps.  Moved existing file to media/wlmaps.moved.

The folder media/wlmaps.moved/maps contains all maps. What i did to resolve this:

- copied all files from media/wlmaps.moved/maps/* to media/wlmaps/maps 
- bzr resolve --all
- sudo rm -R media/wlmaps.moved

Hopefully i did it right on alpha and wl.widelands :-[]
-- 
https://code.launchpad.net/~widelands-dev/widelands-website/cleanup_ggz/+merge/301588
Your team Widelands Developers is subscribed to branch lp:widelands-website.