hilbert / hilbert-docker-images

Application with a dynamic choice of docker containers to run
Apache License 2.0
22 stars 8 forks source link

GitHub development model #2

Closed porst17 closed 9 years ago

porst17 commented 9 years ago

I think we should use master as our main development line together with feature branches which are merged back to master as soon as they are ready. This also allows to close tickets in the issue tracker via commit messages (upon merge). Certain points in the timeline should be marked by tags (e.g. poc0, poc1 etc.).

Any opinions?

malex984 commented 9 years ago

Yeah, I was planning to merge side branches after your testing/checking. After i verify cups i will merge it into mater

malex984 commented 9 years ago

IMO poc is now ready to be merged into master, right?

porst17 commented 9 years ago

Yes, please merge. Also tag the merged version if you want.