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

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Dec 2, 2009, 14:26 UTC
Message-ID: <4B167925.8080307@drmicha.warpmail.net>
In-Reply-To: <1259752954810-4099323.post@n2.nabble.com>

GittyUser venit, vidit, dixit 02.12.2009 12:22:

Show 16 quoted lines

> 
> I have once cloned a a project from a remote repository:
> git cloned http://repo.or.cz/r/openbsc.git
> 
> After that I modified some files and commited.
> In the mean time the remote repository had several commits. Now I want to
> update my local repo from the remote repo but I also want to keep my own
> commits. So, when doing "git pull" I get the message that certain files
> needs to be updated.
> 
> Now, how can I get my local repo, with my own modification, updated by the
> remote repo?
> I know I need to be aware that those updates (or commits) from remote must
> not conflict with my local.
> 
> Thank you.

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?

Michael