Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

We need to merge inasafe-develop into master #268

Open
adisadit opened this issue Jun 9, 2015 · 4 comments
Open

We need to merge inasafe-develop into master #268

adisadit opened this issue Jun 9, 2015 · 4 comments
Labels
Ready

Comments

@adisadit
Copy link
Contributor

adisadit commented Jun 9, 2015

Hello @rduivenvoorde

The live website is still using InaSAFE 2.2 and we need to merge with inasafe-develop so the master can also use InaSAFE 3.1 and QGIS 2.8.1. Tim mention you to help me with the merge (since i don't know how to merge branch to master). Thanks!
@mach0
Copy link
Contributor

mach0 commented Jun 9, 2015

hi!
a "merge" is probably not the correct word here.. basically you force develop to overwrite master and adjust the small things that are needed to run it as master (some script and inasafe adjustments).
I would be available later this day to probably do this..

@adisadit
Copy link
Contributor Author

adisadit commented Jun 9, 2015

Hi Werner!

Ah okay so it's not merge. Thanks for correction Werner.

@rduivenvoorde
Copy link
Contributor

ok, merged in 56c33ad

not to be build though, first Maria's recent work has to get pulled in

@rduivenvoorde
Copy link
Contributor

done, and added howto build docs in README.md
https://github.com/AIFDR/inasafe-doc/tree/master#docker-build-on-your-machine

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
Ready
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@mach0 @rduivenvoorde @adisadit