Ah, my bad, with a fresh git clone, the master is correct !

Ok, fine, I'll apply my last commit onto this branch.

Thanks and sorry for yhe noise :-)


Le 25/12/2017 à 13:54, Emmanuel Lécharny a écrit :
> 
> 
> Le 25/12/2017 à 07:23, Stefan Seelmann a écrit :
>> On 12/25/2017 12:57 AM, Emmanuel Lécharny wrote:
>>>
>>>
>>> Le 25/12/2017 à 00:39, Stefan Seelmann a écrit :
>>>> On 12/24/2017 11:55 PM, elecharny@apache.org wrote:
>>>>> This is an automated email from the ASF dual-hosted git repository.
>>>>>
>>>>> elecharny pushed a commit to branch shared-value
>>>>> in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
>>>>
>>>> Hi Emmanuel,
>>>>
>>>> your last 2 commits went to the "value" branch, I guess they should go
>>>> to master?
>>>
>>> Well, I checked teh master, and it lacks some of the 'value' branch
>>> updates, so I guess the merge from the value branch into the master
>>> branch hasn't worked as expected :/
>>
>> Oh :-(
>>
>> Do you have an example of a missing change?
> 
> Typically, the Value class is missing in trunk.
> 
> 
>>
>> Last change in value branch was 16b5e0edaec53bc8bbc2eb6598d372f7ef89b046
>> which is in master.
>>
>>> So I applied my changes into the value branch first, and I'm now trying
>>> to merge it back to master (which is not easy, with 300+ conflicts ;-).
>>
>> I dont' understand why conflicts happen. The two changes you committed
>> can be merged to master without problem:
>> https://github.com/apache/directory-ldap-api/compare/shared-value
> 
> 
> I have to redo that from scratch (ie, git clone the repo, and see what I
> get in master and shared-value branches).
> 
> I'll tell you tonite :-)
> 

-- 
Emmanuel Lecharny

Symas.com
directory.apache.org