Hi Nitesh
thank you, I could resolve the conflict now.
Probably the issue was that I tried to set the version directly to
1.7.1, and the conflict was either 1.5.2 or 1.7.0
Best, Matthias
On 06/14/18 16:54, Turaga, Nitesh wrote:
Hi Matthais,
You DESCRIPTION file is malformed which is why the
Hi Matthais,
You DESCRIPTION file is malformed which is why the pre-receive hook did not
catch the version number.
<<< HEAD
Version: 1.5.2
Date: 2018-06-12
===
Version: 1.7.0
Date: 2018-03-22
>>> 90a1811ecfe3bbc3d9594f32d54b006afb2d2ac5
This is from a “merge” and has to be correc
Hi Matthais,
You can change your commit locally. Your version hasn’t been updated because
the pre-receive hook has caught it. Just to further explain, “pre-receive” is
before the the commit is received by the bioconductor server, so the version on
the server is still correct and unchanged.
You
