[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Conflict committed

From: David Wood
Subject: Conflict committed
Date: Wed, 29 Oct 2003 11:12:28 -0500

I just found that one of the developers here has managed to commit a file 
with a conflict in it.

I had been under the impression, based on documentation and past 
experience, that it was impossible to commit a file with conflict markers 
inside it. However, I just witnessed this.

Are my assumptions about this mistaken? What circumstances allow 
unresolved conflicts to be committed back to the repository?


reply via email to

[Prev in Thread] Current Thread [Next in Thread]