Source Control and Jira
In general, we prefer to work where each particular feature has been done in a Git branch. Therefore, when doing any work on any of the Fudge Messaging code lines:
- Choose a Jira issue for your work
- If one already exists, assign it to yourself
- Otherwise, create a new one and assign it to yourself
- Branch your Git repository with a branch named the same as your Jira code (such as FRJ-2)
- Do all your work in the branch
- Merge your branch into your master
- Submit the full work after merging into the master
This might look like:
git branch FRJ-2 git checkout FRJ-2 Make your changes, doing git commit along the way git checkout master git pull origin master git merge FRJ-2 Resolve any merge conflicts and commit