Le 25/12/2017 à 00:39, Stefan Seelmann a écrit : > On 12/24/2017 11:55 PM, [email protected] 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 :/ 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 ;-). 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. -- Emmanuel Lecharny Symas.com directory.apache.org
