From: Joe Fiorini Date: Tue, 02 Dec 2008 14:56:45 GMT Subject: Re: git-svn rebase "problems" Message-ID: <73fd69b50812020656u3fd17015n267f694236982e5@mail.gmail.com> In-Reply-To: <73fd69b50811301917j6535f289uf177976707914e46@mail.gmail.com> 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 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 > 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). > > Is there anything I could do to get around this without having to > merge code I'm unfamiliar with? > > Thanks all! > Joe Fiorini > -- > joe fiorini > http://www.faithfulgeek.org > // freelancing & knowledge sharing > -- joe fiorini http://www.faithfulgeek.org // freelancing & knowledge sharing