Subject: how to ignore merge conflicts?

From: Len Brown <[email-masked]>
Date: Mon, 30 Oct 2006 14:48:38 -0500

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,