Re: [Monotone-devel] "warning: resolve non-content conflicts..."

[Thomas Keller]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

William Uther schrieb:
> 
> On 27/11/2007, at 7:17 AM, Benjamin Place wrote:
> 
>>
>> I'm trying to propagate some changes between two branches, and I'm
>> getting:
>>
>>   mtn: warning: resolve non-content conflicts and then try again.
>>   mtn: error: merge failed due to unresolved conflicts
>>   mtn: warning: rename target conflict: nodes 505, 485, both want
>> parent 347, name FileName.java
>>   mtn: warning: resolve non-content conflicts and then try again.
>>   mtn: error: merge failed due to unresolved conflicts
> 
> The merge is trying to give two files the same name, and failing. [...]

Very good description! I think there is already a FAQ page on the wiki
[0], maybe it would be a good idea if we post this and other similar
questions there, answer them once in detail and just direct new people
to the appropriate entry?

thm and I recently joked about some kind of IRC bot for similar purposes.

Thomas.

[0] http://www.venge.net/mtn-wiki/FAQ

- --
only dead fish swim with the stream: http://thomaskeller.biz/blog
Für Freiheit und gegen staatliche Überwachungsmaßnahmen:
http://leipzig.vorratsdatenspeicherung.de
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHTSm6af7NlBYNEJIRAvk2AJ9xxG+8oAEqNDz67vrwTNjZ/WROGQCgiAX+
cJCPUy+CTBYdsDy4/X++/GU=
=QUL6
-----END PGP SIGNATURE-----