I have an local branch say my_local , I have commits few changes & push to server but still not merge with master branch . Now I have few more changes to push from same branch but I wanted to do pull & merge with master.
I simply follow:
But this is showing all master-branch new changes as modified in my local branch. What is wrong in that, anything I'm missing ?
Please suggest !
You can use git rebase
git fetch origin
git rebase origin/master
This is very common scenario. you do follow below steps:-
git stash
. git checkout master
. git pull origin master
. git checkout your_local_branch
. git stash pop
. Hope these steps are clear and let me know if you need any other info.
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.