Branches - developers, read me! =D

[thibautjombart]

Permanent branches

• master: functional devel version, meant to be used by people, so it should be relatively safe. Please do not push changes preventing the package from being installed or breaking backward compatibility unless this has been agreed on, and avoid warnings at all cost - we need travis's green light.
• newfeatures: used for pushing changes that still need testing/checking; warnings are fine, but avoid pushing changes preventing the package from installing

Experimental changes

For experimental changes, the best course of action is fork the project and make a pull request when your patch is ready.

Other (unused) branches

• roxygen2: was used for migrating the doc of the package to roxygen2 (was manual before); not fully integrated, migration is only partial at this stage. This is an old branch.
• gh-pages: would be used for a website on github pages; not used at the moment

[zkamvar]

Question: what sort of guidelines do you have for developers regarding pull requests into master? Should we wait for approval from @thibautjombart, or would having two pairs of developer eyes on it suffice?

[romunov]

I think either @thibautjombart or you are sufficient to approve.

[thibautjombart]

Hey. Sorry, late reply, conference etc. Good question, I haven't given it much thoughts. To repeat the above, the rule is the master has to be functional. Minor changes, or small new features can go without my approval if I'm away. For major changes, at this stage I'd still like to check before they go through.

@zkamvar @romunov both of you should be able to accept pull requests for non-major changes without my go. Checking now if you can..

[zkamvar]

Minor changes, or small new features can go without my approval if I'm away.

I think this is good guidance. I believe both @romunov and I have the ability to accept pull requests.