Mmh.. but it seems like the merge conflicts are not gone. If I do a
bzr merge lp:widelands
I still get tons of merge conflicts. We need to resolve those, otherwise we will not be able to merge on wed. Can you have another look?
« Back to merge proposal
Mmh.. but it seems like the merge conflicts are not gone. If I do a
bzr merge lp:widelands
I still get tons of merge conflicts. We need to resolve those, otherwise we will not be able to merge on wed. Can you have another look?