From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Sat, 19 Feb 2011 15:31:37 GMT
Subject: Re: Merging limitations after directory renames -- interesting test repo
Message-ID: <AANLkTi=WCqUE-wAnhuG8Osrm3UcA5OXXRScqL-0COrVj@mail.gmail.com>
In-Reply-To: <AANLkTimiZo8yiwnqzbOTg1FmM4rZn7ypSdZ3-zukLees@mail.gmail.com>

On Sat, Feb 19, 2011 at 10:22 AM, Martin Langhoff
<martin.langhoff@gmail.com> wrote:
>  git merge-helper --prefer-path foo/preferred/README

The concrete example in this repo could be

 gitk pg master --  trunk/etherpad/src/templates/store/eepnet_eval_signup.ejs \
    etherpad/src/themes/default/templates/store/eepnet_eval_signup.ejs \
   etherpad/src/templates/store/eepnet_eval_signup.ejs

The ideal thing would be to have a helper that knows what to do if I say

  git merge-helper --prefer
etherpad/src/themes/default/templates/store/eepnet_eval_signup.ejs

cheers,


m
-- 
 martin.langhoff@gmail.com
 martin@laptop.org -- Software Architect - OLPC
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff