From: GittyUser <xtelligence@gmail.com>
To: git@vger.kernel.org
Subject: How to update from remote origin with local modified branch?
Date: Wed, 2 Dec 2009 03:22:34 -0800 (PST) [thread overview]
Message-ID: <1259752954810-4099323.post@n2.nabble.com> (raw)
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.
--
View this message in context: http://n2.nabble.com/How-to-update-from-remote-origin-with-local-modified-branch-tp4099323p4099323.html
Sent from the git mailing list archive at Nabble.com.
next reply other threads:[~2009-12-02 11:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-02 11:22 GittyUser [this message]
2009-12-02 14:26 ` How to update from remote origin with local modified branch? Michael J Gruber
2009-12-02 16:20 ` GittyUser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1259752954810-4099323.post@n2.nabble.com \
--to=xtelligence@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).