Concurrently, if someone (@tomBeach, @NealHumphrey, @alulsh, or whoever) wants to create a new branch from the current master (git checkout -b merge-toms-work) then manually add the changes from @tomBeach's branch to the new merge-toms-work branch, we should be able to merge this into master then deploy to gh-pages.
To Dos:
[ ] Verify IE10 compatibility - @alulsh can do this using BrowserStack
[x] Create new branch off of master + add Tom's code
@tomBeach has a beautiful and very functional UI in the
tomBeach-refactor
branch! š See https://github.com/dcfemtech/hackforgood-waba-map/tree/tombeach-refactor.I'd love to get this merged into the original master branch as soon as possible so that we can work off of one unified code base.
Since most of the work was done in a separate fork (https://github.com/tomBeach/hackforgood-waba-map) instead of on a feature branch in this repo (https://github.com/dcfemtech/hackforgood-waba-map), the two codebases have different commit histories and cannot be automatically merged.
Looks like @tomBeach removed ES6 in https://github.com/dcfemtech/hackforgood-waba-map/commit/faa2afcc73e44ab986822cf2d606c421f27b7ac1. One next step for that is to verify this project works in IE10+.
Concurrently, if someone (@tomBeach, @NealHumphrey, @alulsh, or whoever) wants to create a new branch from the current master (
git checkout -b merge-toms-work
) then manually add the changes from @tomBeach's branch to the newmerge-toms-work
branch, we should be able to merge this intomaster
then deploy togh-pages
.To Dos:
[ ] Verify IE10 compatibility - @alulsh can do this using BrowserStackmerge-toms-work
against themaster
branch