`1 - git stash
2 - git checkout develop
3 - git pull
4 - git rebase develop <your branch>
5 - git stash apply
Please wait, that is for a situation where you're working on a branch and you've uncommited changes and you suddenly want to move to other branch for some work. Lets say you need to fix some bug (edited)
Git stash will stash your changes and once you come to the same branch and execute `git stash apply` it will provide you those changes
But lets say you don't have that situation, you're working as normal feature branch and you've done with your changes and planning to push a PR then you don't need any stash related commands
In that case you need, `git checkout develop`, `git pull`, `git rebase develop <your branch>`, `fix conflicts if any`, `git push origin your branch name` if failed then `git push --force origin your branch name`
got it?`
2 - git checkout develop
3 - git pull
4 - git rebase develop <your branch>
5 - git stash apply
Please wait, that is for a situation where you're working on a branch and you've uncommited changes and you suddenly want to move to other branch for some work. Lets say you need to fix some bug (edited)
Git stash will stash your changes and once you come to the same branch and execute `git stash apply` it will provide you those changes
But lets say you don't have that situation, you're working as normal feature branch and you've done with your changes and planning to push a PR then you don't need any stash related commands
In that case you need, `git checkout develop`, `git pull`, `git rebase develop <your branch>`, `fix conflicts if any`, `git push origin your branch name` if failed then `git push --force origin your branch name`
got it?`
No comments:
Post a Comment