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.

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

Merge refactor from @tombeach into master #77

Closed
2 tasks done
alulsh opened this issue Aug 16, 2016 · 1 comment
Closed
2 tasks done

Merge refactor from @tombeach into master #77

alulsh opened this issue Aug 16, 2016 · 1 comment

Comments

@alulsh
Copy link
Member

alulsh commented Aug 16, 2016

@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 faa2afc. 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 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
  • Create new branch off of master + add Tom's code
  • PR merge-toms-work against the master branch
@alulsh
Copy link
Member Author

alulsh commented Aug 17, 2016

This was done in #78 🎉!

IE10 compatibility to be tackled seperately post-merge in #82.

@alulsh alulsh closed this as completed Aug 17, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant