Re: How to update from remote origin with local modified branch?

Michael J Gruber-2 wrote:

I think you want to read up on workflows with git and decide whether you
want to rebase or merge. In short, git fetch --all (which is called by
git pull) will update your remote tracking branches (origin/*), and then
you can decide what to do with your local branch (probably master): Do
you merge origin/master into master, or do you rebase master onto
origin/master?

Thnx for your response,

What I want is merge origin/master to local branch master.  My mistake is to
have some uncommited files and I guess that's the reason why it's not,
pardon me, it could not be updated. So I try to commit the files, but still
had issues about unmerged files. So as advised I did "git add -f
unmergedfile" and than they were added to the Index. Did finally the commit
and now get the "Already up-to-date" message after a pull command.

Still need to practice a lot to know what is exactly going on.

-- 
View this message in context: http://n2.nabble.com/How-to-update-from-remote-origin-with-local-modified-branch-tp4099323p4100678.html
Sent from the git mailing list archive at Nabble.com.