Drop dual master-develop branching in favor of a single prod branch about questions-and-answers

[David-Estevez]

LGTM!

[PeterBowman]

To sum up, at the time of writing this we follow the gitflow workflow approach almost everywhere (documentation-like repos aside). It is proposed to perform a paradigm switch by adopting the forking workflow instead.

Next steps:

• edit and update: README.md, CONTRIBUTING.md, travis.yml
• merge develop into master
• in GitHub, set master branch as default and enable protection
• in travis-ci.com, schedule cron jobs to target master instead of develop
• just in case, also in travis-ci.com: delete develop branch cache files
• drop a comment in roboticslab-uc3m/developer-manual#16
• poke everyone in this org about the ongoing changes and the following point
• delete the develop branch (in a week or so, let's see)

Edit. Since not all repos will be referenced by commits below this comment, I'm listing them here:

• color-debug
• asibot-configuration-files
• amor-configuration-files
• teo-configuration-files
• data-visualization
• bullet-yarp-plugins
• jr3pci-linux
• openrave-tools
• textiles
• WBPCwaiter
• robotDevastation-openrave-models

[PeterBowman]

cc @roboticslab-uc3m

Most or all org repos will undergo a significant change in the branching logic. The pair master & develop will cease to exist in favor of a single master branch, following the Forking Git workflow. In the next few days, there will be no more a develop branch, so please stay tuned/calm and git checkout master && git pull. Existing feature branches should merge or be rebased against master.

[PeterBowman]

So, do we all agree on this? Pinging @David-Estevez per #7 (comment), among other issues.

[PeterBowman]

This is all done. The announcement was made here: #88 (comment). Recap: please switch your local repositories to master (git checkout master) and pull latest changes (git pull). Your local work should be merged into the master branch, there is no develop any more.

[jgvictores]

PS: Ran into warning: ignoring broken ref refs/remotes/origin/HEAD a couple of times. Via https://stackoverflow.com/questions/45811971/warning-ignoring-broken-ref-refs-remotes-origin-head, solution adapted from kdechant (refer to SO for alternatives):

git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/master

Edit by @PeterBowman in order to make this show up in search results: (refs/remotes/origin/HEAD has become dangling).

[PeterBowman]

I have just switched branches in robots.uc3m.es in order to generate doxygen files for master instead of old develop.

[jgvictores]

IMHO yes, I agree. Our current workflow does not benefit from the master/develop branches. In fact, all we get is a very old master branch which we update when we remember and it looks outdated (a criterion that results in very arbitrary dates and circumstances).

[jgvictores]

@PeterBowman Thank you so much for all of this!!

[jgvictores]

@PeterBowman thanks a lot for this!