git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: Joe Fiorini <joe@faithfulgeek.org>
Cc: git@vger.kernel.org
Subject: Re: git-svn rebase "problems"
Date: Tue, 02 Dec 2008 16:32:56 +0100	[thread overview]
Message-ID: <49355528.80503@drmicha.warpmail.net> (raw)
In-Reply-To: <73fd69b50812020656u3fd17015n267f694236982e5@mail.gmail.com>

Joe Fiorini venit, vidit, dixit 02.12.2008 15:56:
> Are there any other details I can provide to get an answer on this?
> 
> Thanks!
> Joe
> 
> On Sun, Nov 30, 2008 at 10:17 PM, Joe Fiorini <joe@faithfulgeek.org> wrote:
>> I'm having some problems with git svn rebase. I'm pretty sure this is
>> just the way git works, not a problem per se. But it's causing trouble
>> for me and my team.
>> My team is currently on Subversion. I'm trying to convince some people
>> that git is a good way to go.
>>
>> So I'm using git-svn. My team tends to commit to the svn server fairly
>> often. It has happened more than once that, because git svn rebase
>> applies each svn commit sequentially, some of the commits will
>> conflict with each other - whether or not I have ever touched the

git svn rebase fetches all svn commits and then rebases your current
branch onto FETCH_HEAD (the last svn commit). In doing so, it applies
the commits you have on your branch (since merge base) one by one.
What do you mean by "applies each svn commit sequentially"?

>> file. Obviously, this is a big problem because if I've never touched
>> the file, then I probably won't know exactly how to resolve the merge
>> (the merge markers haven't been solely reliable).

If you develop on a local branch and get conflicts with others' commits
someone has to resolve them, whether you use git or svn. But I'm
surprised there are conflicts in files you didn't touch. Can you share
more details on the files or the workflow/repo?

Michael

      parent reply	other threads:[~2008-12-02 15:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-01  3:17 git-svn rebase "problems" Joe Fiorini
2008-12-02 14:56 ` Joe Fiorini
2008-12-02 15:21   ` Peter Harris
2008-12-02 15:32   ` Michael J Gruber [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=49355528.80503@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=joe@faithfulgeek.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).