Re: Parallel refactoring and git merge nightmare
- From
- Eugene Sajine <euguess@gmail.com>
- Date
- Apr 12, 2012, 16:03 UTC
- Message-ID
- <CAPZPVFbBPXzTaY5rAqs8NMWMaepo_pmB6-skDL-=VbOHzUz55A@mail.gmail.com>
- In-Reply-To
- <1334238768.18499.YahooMailNeo@web160601.mail.bf1.yahoo.com>
On Thu, Apr 12, 2012 at 9:52 AM, Pap Lôrinc <paplorinc@yahoo.com> wrote:
Show 15 quoted lines
> Thank you all for the answers! :) > > > I have already set the rename limit to 0, and upon committing and fetching the renames are calculated and found. > > > The commands are (I use tortoise git now, but tried the console and other GUIs, as I said in my first post) "git svn fetch" and "git merge remoteBranch". > I figured now, that this was the problem, I should have used rebase instead of merge (I still don't understand why merge doesn't work, but rebase and conflict resolution with a GUI (where I can resolve more files at once) seems acceptable). Thanks David! :) > > Lőrinc > > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
As an addition I would recommend to be a little more strict about how refactoring is committed: I.e. split up the repackaging and actual code refactoring - as a rule we are committing renames separately from other changes or with minimal changes (like package change for java classes) Then i would use the rebase if there is some parallel work as suggested above
Hope that helps, Eugene