Removing already merged branches

[martin-ueding]

The QPhiX repository has a lot of branches that are already merged. I was told that there is some BG/Q support and I'd like to try that out. To me it is not really clear which branch I should take:

• devel is the most recent one
• bgq_port_debug seems to largely be bgq_port (merged into master) but might have something interesting in there
• optimize-strongscale has some commits regarding BG/Q but it is not merged into master or devel

Which of these branches would be the one with the best chances to run on BG/Q?

Also there are a bunch of branches that are already merged into either master or develop and are still kept around:

• tbb-alloc
• avx512
• icc15-hotfix
• bgq_port
• bgq_port_off_adf4drd
• minvcg

Deleting those would make it easier to see the branches which are not yet merged:

• icc16-hotfix (March 2016)
• qphix-tmf (August 2015)
• optimize-strongscale (June 2015)
• bgq_port_debug (December 2014)

And there it is hard for me to tell which branches are worth trying out and what has ended and will not be worked on any further. Could one do something to make the various branches a bit easier to understand?

[martin-ueding]

devel is the branch to use, master will get updated when there is a stable state. The other branches preserve history. Using devel will be the best starting point.