From: Len Brown <len.brown@intel.com>
Date: Mon, 30 Oct 2006 19:48:38 GMT
Subject: how to ignore merge conflicts?
Message-ID: <200610301448.38222.len.brown@intel.com>

Sometimes when a multiple-file merge give conflicts, I don't want to edit
one of the resulting <<<<<=====>>>>> files.
Instead, I just want to choose the version of that particular file that
existed in one of the two merged branches and commit that along with
the rest of the merge.

How to do this?

thanks,