getting remote changes on my local copy

Question

this is probably very trivial but I am confused by terminology used in git.

I have a local branch with lots of uncommited and modified files, and there is a remote/master branch.

I am not ready to push all my local changes to remote/branch since it would start a large merge. I would just like to receive the other changes in remote/branch and apply them on my local version without changing branch.

how to do this? I have been using git extensions but it is not available for me now, I only can use git CLI

so if I do `git pull remote master` it should not delete my precious local changes? — 00__00__00, Oct 18 '17 at 14:01
I am not keen on experimenting because an error here can cost me really a lot — 00__00__00, Oct 18 '17 at 14:01
See https://stackoverflow.com/a/40208194/20371 for a way to do this safely. If there are merge conflicts you will, of course, need to resolve them. It's important to learn how to do that also. — Yawar, Oct 18 '17 at 15:56

score 2 · Answer 1 · answered Oct 18 '17 at 14:05

2

You must use git pull to achieve what you want.

See this comment: What is the difference between 'git pull' and 'git fetch'?

And, of course, for real learning, Git documentation: git pull

answered Oct 18 '17 at 14:05

Marcelo Gonçalves

41
4

I have done my learning. I would have had to stash the changes – 00__00__00 Oct 18 '17 at 15:46
However the automerge after `git stash apply` changed some files so now I have to go through them one by one and remove the <<< change upstream part – 00__00__00 Oct 18 '17 at 15:47
exactly what I wanted to avoid, what was the right way to avoid this? – 00__00__00 Oct 18 '17 at 15:47
@Liborio: The way to avoid this is never to "have a local branch with lots of uncommited and modified files." Commit and merge earlier and more often. – John Zwinck Oct 19 '17 at 03:52

score 1 · Answer 2 · answered Oct 18 '17 at 15:20

1

First what you need to do is make sure your master is latest and greatest. If not just do git pull origin master.

Secondly then commit your local changes to your branch and merge that branch into your master and then push your master to the origin.

answered Oct 18 '17 at 15:20

danglingpointer

4,708
3
24
42

getting remote changes on my local copy

2 Answers2