THIS IS A TEST INSTANCE. ALL YOUR CHANGES WILL BE LOST!!!!
...
For a long lived branch where you want to see the merge history with develop:
| Code Block |
|---|
git flow feature finish --no-ff GEODE-nn |
Without git flow:
git checkout develop
git pull
git merge --no-ff feature/GEODE-nn
git branch -D feature/GEODE-nn
git push --delete origin feature/GEODE-nn
If you have done a bunch of merges from develop to your feature branch, but you still want to see only a single commit on develop, you can do a squash merge to develop:
| Code Block |
|---|
git flow feature finish -S GEODE-nn |
Without git flow:
git checkout develop
git pull
git merge --squash feature/GEODE-nn
git branch -D feature/GEODE-nn
git push --delete origin feature/GEODE-nn
14) push
| Code Block |
|---|
git push |
15) change ticket status of GEODE-nn from IN PROGRESS to RESOLVED (click "Resolve Issue" and fill in details)