Branch from master or staging? conflicting information in the wiki

IKL Development
#1

This page: https://indeni.atlassian.net/wiki/spaces/IKP/pages/63012870/Pushing+code+git

says very clearly: "Each contributor must create their own branch separately (branch out from "staging")..."


But this page: https://indeni.atlassian.net/wiki/spaces/IKP/pages/69959710/Using+SourceTree

says: "6. To create your own branch, in SourceTree, click the branch button.... In the below screenshot it says "Current branch: jontaa" but for you that will be "master".


I'll try to clean up the docs if someone can tell me which is correct.

#2

Hi Hawkeye,

Good catch. Let's sit down tomorrow and we'll sort this out.

Thanks.

#3

After chatting with Ulrica, it's clear that the answer is: branch from Staging, not Master. I will clean up the docs.