Git: pull remote branch to local

Question

I am new to git.

I have an issue where I get this message when I checked out a local branch:

Your branch and 'origin/master' have diverged,
and have 5 and 4 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

My concern is if I pull changes from the remote and merge it to my local branch will it affect any of my changes I have made in my local?

I have been reading around and the closest is probably this but it did not answer my concern.

you wont loose any of your changes if that is what you are concerned about. if there are conflicts you will however need to resolve them — kmera, Jan 19 '14 at 22:15

score 1 · Accepted Answer · answered Jan 19 '14 at 22:23

Hi you can create a new branch from your current branch with:

git branch my_changes

later you can pull the branch,(for example master) now if the merge generate a conflict you can resolve them, but only your real change is in branch "my_changes"

if you want switch your change branch you can type

git checkout my_changes

Git: pull remote branch to local

1 Answers1