directory-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Stefan Seelmann <m...@stefan-seelmann.de>
Subject Re: [directory-ldap-api] branch shared-value updated: Added a (first) version of SASL CRAM-MD5 and DIGEST-MD5 dedicated bind function. Note that the DIGESTMD5 does not have enough parameters.
Date Mon, 25 Dec 2017 06:23:40 GMT
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?

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

> Most of the conflicts are trivial, some are a bit more complex, but I
> think it's going to be completed in the next couple fo days.
> 
> And, yes, we should delete the 'value' branch once done.
> 


Mime
View raw message