GittyUser venit, vidit, dixit 02.12.2009 12:22: > > 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html