Question about git workflow
So long story short we want to have a smiple workflow for doing changes. Would be great if someone could review, and also answer me a few questions.
Assuming a new requirement comes in, I'd identify the following steps (not considering build and deployment yet)
- clone according repository
- if already cloned, git pull to get the latest version from the repository
- branch out from main using JIRA ticket number in our case (we are on Atlassian)
- Do your changes
- Commit your changes
- (Optionally do further changes and commit them again, if there is a good reason to do intermediate commits)
- Create a pull request
- Pull request gets declined -> go back to 4 | Pull request gets approved go to 9
- A merge happens and the branch is deleted on Bitbucket (it's a global setting, I thought it's a good idea to just get rid of them, or is it not)
- Here it's a bit difficult for me to understand how to continue. Is the developer recognizing somehow if the merge was approved or not? I guess email settings on bitbucket? Should I tell the developers to delete their local branches as well, I assume this is a manual task? Is there an easy way to that?
So overall, does this sound about right? Anything I forgot or could do better? Should I be prepared to keep some more commands document and handy for the team?
Thanks!