📝 Update and organize project documentation and assets
This commit is contained in:
10
docs/projects/memorypalace/Apple Notes/git stash.md
Normal file
10
docs/projects/memorypalace/Apple Notes/git stash.md
Normal file
@@ -0,0 +1,10 @@
|
||||
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
|
||||
Reference in New Issue
Block a user