Document branch per feature

[gberche-orange]

Possible content:

The generated pipeline includes automatic merging of branch from the template and secrets git repos maching the regular expression develop,WIP-,wip-,feature-, Feature- see source

In case of merge conflict or rewritten history, you may trigger a reset by manually triggering the reset-merged-wip-features job.

The current practice is to create a feature branch matching the regular expression below and to push incremental commits into it. Once satisfied and ready to share/PR, then:

• Rebase your feature branch against develop
• Squash your baby steps commits in your feature branch
• Merge the feature branch into develop
• Archive the merged branch git branch archived-feature-etherpad feature-etherpad; git push gitlab-preprod --set-upstream archived-feature-etherpad; git push gitlab-preprod :feature-etherpad

[o-orand]

I've updated your proposal, I don't think the archive part is useful. Archived branches are created by our gitlab in some cases.