From: Adam Brewster <adambrewster@gmail.com>
To: "G.zhen.ning" <g.zhen.ning@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: what's wrong wtih my rebase? (git-svn)
Date: Tue, 4 Aug 2009 23:46:01 -0400 [thread overview]
Message-ID: <c376da900908042046p1ae1a59dr6bc50fa7812a1968@mail.gmail.com> (raw)
In-Reply-To: <44ceb8150908041847mbf7d238r60a59ee40ef6e232@mail.gmail.com>
On Tue, Aug 4, 2009 at 9:47 PM, G.zhen.ning<g.zhen.ning@gmail.com> wrote:
> git svn fetch
> git svn rebase
> git diff
> vim my.html.erb (resolve the conflict)
? git add html.erb # (tell git you resolved the conflict)
> git rebase --continue
>
prev parent reply other threads:[~2009-08-05 3:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-05 1:47 what's wrong wtih my rebase? (git-svn) G.zhen.ning
2009-08-05 3:46 ` Adam Brewster [this message]
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=c376da900908042046p1ae1a59dr6bc50fa7812a1968@mail.gmail.com \
--to=adambrewster@gmail.com \
--cc=g.zhen.ning@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).