search

OpenGeoscience / geoweb

Open source geoscience tools and applications
8 stars 3 forks source link

Multiple layers and workflows doesn't currently work together #116

Closed cjh1 closed 10 years ago

benbu commented 11 years ago

Fixed in branch 54-2-workflow-construction, awaiting merge into master.

aashish24 commented 10 years ago

Ben is your branch in next yet? If not can you push it? If you have merge conflicts let us know.

benbu commented 10 years ago

No, it seems that other recent branches are largely in conflict with mine. I'll try to merge master into my branch (again), but I need my branch to get into master soon as it is starting to get very diverged.

aashish24 commented 10 years ago

I see. Fair enough. I didn't check if you have any merge conflict with master if not when don't worry, I can hard reset next anyways.

benbu commented 10 years ago

I just merged master into my branch again, there were conflicts, after resolving, things don't work. I'm investigating at the moment.

benbu commented 10 years ago

geoweb_dev appears to be gone, was this removed?

benbu commented 10 years ago

I was able to fix the issue, there was a problem in geo/archiveLayerSource.js

benbu commented 10 years ago

Fixed in branch 54-2-workflow-construction and now merged into next, let me know if you have any issues with it.

aashish24 commented 10 years ago

Sure.. closing it for now