Question about merge conflicts

Hi,
I ran the following scenario, and wonder if the result is the expected
behavior or not:

* 2 developer works in 2 different branches under trunk.
* User A change file kuku.txt in branch dev_A and commit
* User B move the file kuku.txt to another location in dev_B and
commit
* User A merge is change to trunk and commit
* User B perform rebase (merge from trunk to dev_B)

The result: the new version of user B is deleted because the move of
User A delete the file from its original location.
The old version of kuku.txt is now in the new location (due to the
move).
 
User B lost his new version without notifying about it.
Is there any elegant solution for such cases ?
 
 

JJJ,

Ido Strahovsky,

iNet: 84651512

office: +972-4-8651512

cell: +972-54-7885750

 
Received on Mon Mar 12 16:39:23 2007