Re: AW: Migrating from CVS - a couple of questions

Well, if you have a code reformatter that works, you could always just
enforce a policy where everybody runs their code through that (and
saves it back to the WC) before committing.

On Aug 11, 2004, at 1:27 PM, Ciaran Treanor wrote:

> True. The problem I'm having is that developer1 checks code out. He
> doesn't
> like the formatting and reformats it using his preferences, makes some
> code changes and then commits his code.
>
> Meanwhile, developer2 makes some changes to the same code and trys to
> commits but gets a whole load of merge conflicts because developer1
> changed the formatting and committed the file.
>
> I'm trying to see if there are ways around this. Any ideas (other than
> using a big stick!)?

-- 
Kevin Ballard
kevin@sb.org
http://www.tildesoft.com
http://kevin.sb.org