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

Dockerize #83

Merged
merged 3 commits into from
May 31, 2018
Merged

Dockerize #83

merged 3 commits into from
May 31, 2018

Conversation

laidig
Copy link
Contributor

@laidig laidig commented May 30, 2018

as discussed in #69 , now with volume support and update to README

@answerquest
Copy link
Collaborator

@laidig , this is great. I want to merge, but can you tell me which of these options I should take, and after doing it how can I ensure that when I do another git push origin master from my folder it's not rejected for being out of sync or something? What do we mean by rebase? Sorry, am new to this stuff and what I've read so far I haven't understood properly.

merge query

@laidig
Copy link
Contributor Author

laidig commented May 31, 2018

You can go ahead and choose the first one.

The second option is also fine, if you want to keep the total number of commits down.

The third one option is probably more complicated than you need-- it's just us working on the project for now ;)

@answerquest answerquest merged commit 859f72a into WRI-Cities:master May 31, 2018
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

Successfully merging this pull request may close these issues.

2 participants