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

On 28 December 2013 03:36, Rene Rivera wrote:

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 :-(

You can checkout a file from any commit using 'git checkout ref -- path', in this case I think you need: git checkout HEAD -- tools/regression/src/regression.py