- in JIRA, move your ticket to "In Progress"
- make sure your current branch is clean:
git status - checkout the latest release:
git checkout [release_branch_name] - pull the upstream changes on the latest release branch:
git pull origin [release_branch_name] - create and checkout a working branch off of the release:
git checkout -b [working_branch_name] - do your work on the branch
- when work is finished, stage your changes:
git add . - commit the staged changes:
git commit -m 'descriptive commit message' - make sure your branch is clean:
git status - if so, checkout the latest release branch:
git checkout [release_branch_name] - pull the upstream changes on the latest release branch:
git pull origin [release_branch_name] - checkout your working branch again:
git checkout [working_branch_name] - rebase your working branch against the release branch:
git rebase -i [release_branch_name] - after rebase, push your working branch upstream:
git push origin [working_branch_name] - on Github, create a pull request to merge your working branch into the release branch
- in JIRA, move your ticket into "In Review"
- let someone know about the pull request and they will either reject or merge it
- once merged, the person who merged it will update your JIRA ticket to "Merged" status
-
-
Save medun/cac65159f233bf4b8576 to your computer and use it in GitHub Desktop.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment