10 lines
350 B
Markdown
10 lines
350 B
Markdown
git checkout feature/module/assistance
|
|
git merge develop
|
|
git push
|
|
git checkout feature/module/assistance.promptFixes
|
|
git rebase feature/module/assistance
|
|
git push -f
|
|
git checkout hotfix/0.2.1
|
|
git merge feature/module/assistance.promptFixes // This accidentally caused develop commits to be included. Should have been cherrypick
|
|
git push
|
|
git stash pop |