Re: [boost] [git-help][urgent] How do I ignore an upstream change to one file?

Subject: Re: [boost] [git-help][urgent] How do I ignore an upstream change to one file?
From: Rene Rivera (grafikrobot_at_[hidden])
Date: 2013-12-27 22:36:00

On Fri, Dec 27, 2013 at 9:02 PM, Rene Rivera <grafikrobot_at_[hidden]> wrote:

> When I attempt to do an update of the boost superproject I get and error:
>
> Froggy:develop grafik$ git pull
> error: Your local changes to the following files would be overwritten by
> merge:
>  tools/regression/src/regression.py
> Please, commit your changes or stash them before you can merge.
> Aborting
> Froggy:develop grafik$
>
> I know I've made changes. I also know I don't want to throw away my
> changes. I also know that I don't want to merge the upstream changes to
> that one file. Hence.. How do I do a pull and have git ignore the upstream
> of only that file? (i.e. throw away the upstream changes because I know
> that my changes supersede them)
>

And now that I did a commit to attempt to steamroll over the upstream
changes.. And to let the pull do a merge.. The merge fails. How the hell do
I fix this? And how is it that I have yet to come across anything in git
that is a *single* command :-(

Rene.

-- 
-- 
-- Grafik - Don't Assume Anything
-- Redshift Software, Inc. - http://redshift-software.com
-- rrivera/acm.org - grafik/redshift-software.com
-- 102708583/icq - grafikrobot/aim - grafikrobot/yahoo