This article describes how to the code development currently (written 2018) works using git und Bitbucket.
Create an JIRA Issue in the FS3D Board. You will receive an ID like “FS3D-10”.
In the FS3D Board click on the Issue and select Create Branch in the Development Section.
Select the correct repository, specify the branch type (usually “Feature”) and the origin of the branch (usually “develop”).
The branch name is generated automatically.
Create a local copy of the repository if necessary
git clone https://email@example.com/bitbucket/scm/b01vof/fs3d.git
Get all data from the server
Checkout a local copy of the develop and remote branches, for example
git checkout -b develop origin/develop git checkout -b feature/FS3D-10-my_feature origin/feature/FS3D-10-my_feature
Implement your feature and commit the changes using the ID, for example “FS3D-10”, in the commit messages.
Once you are finished, switch back to the original branch (usually “develop”) and get the latest updates from the server
git checkout develop git pull
Integrate your commits by merging the feature branch into the development branch, for example
git merge feature/FS3D-10-my_feature
Resolve possible merge conflicts (team work!).
Push the changes back to server repository
Delete the feature branch from the server and also locally, for example
git branch -d feature/FS3D-10-my_feature git push origin --delete feature/FS3D-10-my_feature (as of git 1.7.0)