I have a simple app with two developers, I have finished my task, here is what I have done
git add.
git commit -m 'my task'
Now when I check the repo on GitHub I see there are new changes from another developer,
So what do I need to do to have new changes in my local machine and merge with my changes?,
Hey that's really simple.
You have to PULL the changes from the remote branch.
git pull origin master
change master to the branch you wish to pull from
checkout https://git-scm.com/docs/git-pull
You must agree that you will edit with your friend.
Before changing files you must make git pull
, and after changing:
git add .
git commit -m "changed files"
git push origin master
Git changing only your edited files, if your friend didn't change file, wich you editing, all is OK.
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.