[dev] [commits] Horde branch imp_6_2_testing created. 607b12f0059b87e4736434c430d1c883a29eab79

[Michael J Rubinsky]

Quoting Michael M Slusarz <slusarz at horde.org>:

> The branch "imp_6_2_testing" has been created.
>         at  607b12f0059b87e4736434c430d1c883a29eab79 (commit)
>
> -----------------------------------------------------------------------
> commit 607b12f0059b87e4736434c430d1c883a29eab79
> Merge: d0dbbc7c816d3adb4b9fd43e5eba92ac1f23be8a  
> 2c9a90f6d6410f21e970d5154457c4e9e04f641b
> Author: Michael M Slusarz <slusarz at horde.org>
> Date:   Mon Dec 16 16:43:41 2013 -0700
>
>     Merge branch 'turba_4_2' into imp_6_2_testing
>
>     Conflicts:
>     	turba/docs/CHANGES
>     	turba/lib/Driver.php
>     	turba/package.xml
>
> commit d0dbbc7c816d3adb4b9fd43e5eba92ac1f23be8a
> Merge: bf41ce65e2480f457f5b7a3c19b6a682cbabafe5  
> 5443edcc804fcb9f1811ac03394038be232e142e
> Author: Michael M Slusarz <slusarz at horde.org>
> Date:   Mon Dec 16 16:42:41 2013 -0700
>
>     Merge branch 'ingo_3_2' into imp_6_2_testing
>
> commit bf41ce65e2480f457f5b7a3c19b6a682cbabafe5
> Merge: 870f9f1e12e6e0d3bb2d0669e1b68799e9d75682  
> 86dd92cace0c07fafa65bbf69672a3a7b36f6076
> Author: Michael M Slusarz <slusarz at horde.org>
> Date:   Mon Dec 16 16:41:08 2013 -0700
>
>     Merge branch 'horde_5_2' into imp_6_2_testing
>
>     I really have no clue if these are the correct conflict resolutions.  At
>     least one of these conflict files are so compeltely different from the
>     current version in horde_5_2, I have no idea how to resolve.

I'm not sure what the purpose of this branch is, but I don't think  
this is the correct way to do the merges. You should create a new  
branch, off of master, and then merge in the various *.2 branches you  
want to include. There *will* probably be some conflicts from the  
erroneous merging and reverting of the development branches into  
imp_6_2 earlier, but that should be the only issues.
-- 
mike

The Horde Project (www.horde.org)
mrubinsk at horde.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5849 bytes
Desc: S/MIME Signature
URL: <http://lists.horde.org/archives/dev/attachments/20131216/d2c03e62/attachment.bin>