directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Emmanuel Lécharny <elecha...@gmail.com>
Subject Re: Txn branch merge : headsup
Date Mon, 11 Jun 2012 06:18:36 GMT
Le 6/11/12 7:52 AM, Selcuk AYA a écrit :
> Hi Emmanuel.
> I think the best way is to first merge the trunk to the branch
I tried both options, and both are equivalent.

> and
> then verify the merge and then merge back to trunk. Please let me know
> if it is possible for you to dump your ongoing effort to a branch.
Sadly no, not until I have some conflicts. SVN does not allow you to 
commit until you've fixed all the conflicts.
>   If
> not, I will try to merge the trunk to the branch I have.
Yes, do that, so that the first of us wh have something working will be 
the next trunk.


-- 
Regards,
Cordialement,
Emmanuel Lécharny
www.iktek.com


Mime
View raw message