howto? specify non-mergability for a file

From: Assaf Lavie <assaflavie_at_gmail.com>
Date: 2005-09-28 17:59:27 CEST

I have a text file under source control that keeps the build numbers
(auto-incremented every build).
The problem is this file is _always_ conflicted when more than one person
works on the project.
Can I mark this file as "always use newer version - never merge" somehow?

Thanks.
Received on Thu Sep 29 14:31:22 2005

This message: [ Message body ]
Next message: Clemens A Mensik: "Re: confused about merging"
Previous message: Martin Matusiak: "confused about merging"
Next in thread: Greg Thomas: "Re: howto? specify non-mergability for a file"
Reply: Greg Thomas: "Re: howto? specify non-mergability for a file"
Reply: Cory Omand: "Re: howto? specify non-mergability for a file"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]