How to design for the following requirement

[Adrian Buehlmann]

On 31.08.2009 15:14, Nirvan B wrote:
> 
> Adrian Buehlmann wrote:
>> I think you now need to mark the files you manually resolved
>> by using
>>
>>    hg resolve -m [FILE]
>>
>> See 'hg help resolve'. Then commit.
>>
>>
>  
> I used this command for the file which shows unresolved conflicts
> (File2.java) . After that I tried to commit. But the commit still fails with
> the same message as before.

Obviously, there are *more* files that you should mark as
resolved, no?

'hg resolve --list' will tell you what these are.

Maybe you want to try using IRC channel #mercurial for more
interactive help.