2016-01-26 Further investigation on git workflows. Came across Anti-Gitflow. ;-) [0] [1] That convinces me more than Gitflow. Read also these articles on the topic: [2] [3] And about Rebasing: [4] [5] It's interesting to study this topic. Up to now, I used VCS only in a primitive way. Now I discover a different -- alternative -- view on the topic. I don't want to say that one is better, I just start to see, why people like git so much: It goes very well with that second view on VCS. A friend of me, akatinha, made her first OSM contribution. [6] It was a pleasure for me to introduce her to OSM. It was also in- teresting to see, that even in well mapped regions like Stuttgart, some remarkable details are still missing. [0] http://endoflineblog.com/gitflow-considered-harmful [1] http://endoflineblog.com/follow-up-to-gitflow-considered- harmful [2] https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html [3] http://www.mail-archive.com/dri- devel@lists.sourceforge.net/msg39091.html [4] https://news.ycombinator.com/item?id=9745966 [5] http://www.darwinweb.net/articles/the-case-for-git-rebase [6] http://www.openstreetmap.org/changeset/36825464 http://marmaro.de/lue/ markus schnalke