Resolving version conflict

[Former Member]

1)Developer1,(Client as Client1)creted Hello.java file chked in now the version is 1.0

2)Developer2,(Client as -

---

) checked out synched edited Hello.java file chked in version is 2.0

Now both the developers checked out the version2.0 Devloper1 cheked in while developer2 got checkin conflict.

Assume that by some means he deleted client,he wont remeber what client name he has given. How to merge this conflict.

[Former Member]

How can he check-in and get a version conflict if he doesn't have a client? Checking in is only possible if you have a client.

Message was edited by: Pascal Willemsen

[Former Member]

Natuarally he can have another client still he will be abel to see edit that file and checkin. this time if i see the version of that particular file version will be increased.

But conflict still arises. May be next option i have to synch at the particular version say at 4.

1----5

2

3

4----5

5

6