git reset HEAD . (note the trailing dot)
git stash (save the conflicted merge, just in case)
git checkout develop
git fetch upstream; git merge upstream/develop
git checkout <new-branch>; git rebase develop
git stash apply stash@{1}
Code Example |
---|
Shell :: appcenter cli |
Shell :: linux ram size |
Shell :: how to stop oneko |
Shell :: hardhat |
Shell :: ubuntu command to list largest files |
Shell :: git proxy |
Shell :: stylelint fix |
Shell :: install tree in linux |
Shell :: mac install gpg |
Shell :: get last element in an array bash |
Shell :: install psycopg2 ubuntu |
Shell :: git error needs merge |
Shell :: gzip folder with tar |
Shell :: iis stop |
Shell :: Update submodules |
Shell :: how to restart the network in ubuntu |
Shell :: curl get-pip |
Shell :: how to remove terminator from ubuntu |
Shell :: ssh remove whole folder command |
Shell :: download woeusb for ubuntu 20.04 |
Shell :: update npm with nvm |
Shell :: vercel installation |
Shell :: linux list services |
Shell :: git show-branch tree command line |
Shell :: uninstall node js from ubuntu |
Shell :: Install Helm Windows PowerShell |
Shell :: bash: make: command not found |
Shell :: pip missingno |
Shell :: homebrew restart redis |
Shell :: xlrd python install |