In git, if I commit something to my local repository, and then I do a pull and merge with my code, does it merge with my local repository as well? If not, then what happens when I push to the master repository? Does it overwrite with my commits or does it merge?
Asked
Active
Viewed 19 times
0
-
Possible duplicate of [What is the difference between 'git pull' and 'git fetch'?](https://stackoverflow.com/questions/292357/what-is-the-difference-between-git-pull-and-git-fetch) – phd Nov 07 '18 at 19:21
-
https://stackoverflow.com/search?q=%5Bgit%5D+pull+merge – phd Nov 07 '18 at 19:21