Git development
 help / color / mirror / Atom feed
From: "Pap Lôrinc" <paplorinc@yahoo.com>
To: David Barr <davidbarr@google.com>
Cc: David Aguilar <davvid@gmail.com>,
	"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Parallel refactoring and git merge nightmare
Date: Thu, 12 Apr 2012 06:52:48 -0700 (PDT)	[thread overview]
Message-ID: <1334238768.18499.YahooMailNeo@web160601.mail.bf1.yahoo.com> (raw)
In-Reply-To: CAFfmPPMbr-db+OnTwK-ry+wGQSEeunsD+QrmAVS2fzDH+hGnbg@mail.gmail.com

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

  reply	other threads:[~2012-04-12 13:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-11 16:13 Parallel refactoring and git merge nightmare Pap Lôrinc
2012-04-11 16:49 ` Michael Witten
2012-04-12  3:27 ` David Aguilar
2012-04-12  5:23   ` Pap Lôrinc
2012-04-12  5:41     ` Andrew Ardill
2012-04-12  5:49     ` David Barr
2012-04-12 13:52       ` Pap Lôrinc [this message]
2012-04-12 16:03         ` Eugene Sajine
2012-04-12  5:41 ` Jeff King

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=1334238768.18499.YahooMailNeo@web160601.mail.bf1.yahoo.com \
    --to=paplorinc@yahoo.com \
    --cc=davidbarr@google.com \
    --cc=davvid@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