git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
GGittyUser <xtelligence@gmail.com>
Date
Dec 2, 2009, 16:20 UTC
Message-ID
<1259770819546-4100678.post@n2.nabble.com>
In-Reply-To
<4B167925.8080307@drmicha.warpmail.net>
Michael J Gruber-2 wrote:
Show 9 quoted lines
> 
> 
> 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.
Previous: Michael J Gruber
Message 3 of 3 in “How to update from remote origin with local modified branch?”
  1. GittyUserDec 2, 2009
  2. Michael J GruberDec 2, 2009
  3. GittyUserDec 2, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.