[Dune-devel] Cannot push: "leftover conflict marker"

[Felix Gruber]

Hi Ansgar,

On 06.09.2016 15:06, Ansgar Burchardt wrote:
> Hi,
> 
> I still cannot push my changes to my `dune-typetree` fork :(
> 
> Could the check for leftover conflict markers be disabled server-side
> given it has false positives that are triggered by existing code in
> DUNE?

I'm now running into the same problem when trying to push to my
repository at https://gitlab.dune-project.org/felix.gruber/dune-dpg

According to the GitLab Documentation [1], the pre-receive hook can only
be disabled by the GitLab server administrators. It seems that the hooks
can be configured per-project, so a simple workaround would be to
temporarily disable the pre-receive hook in the repositories where it is
giving false positives. That can be done by the administrators by simply
removing a symlink (see [1]).
In the long run, we should however discuss removing this check for
leftover conflict markers from the pre-receive hook as it obviously will
lead to further false positives. I'll open an infrastructure bugreport
for this later.

[1]: https://gitlab.dune-project.org/help/administration/custom_hooks.md

Best,
Felix

> On Thu, 2016-08-25 at 16:57 +0200, Ansgar Burchardt wrote:
>> I cannot push some changes to dune-typetree in my forked repository.
>> A pre-commit hook rejects the change:
> 
> That should have been "pre-receive hook"
> 
>>
>> +---
>>>
>>> remote: e17cf1d [Documentation] Rename RELEASE_NOTES to
>>> CHANGELOG.md
>>> remote:  1 file changed, 0 insertions(+), 0 deletions(-)
>>> remote: ----------------------------------------
>>> remote: e17cf1de5607e89079e014a1b1420e814c8fce54
>>> remote: CHANGELOG.md:10: leftover conflict marker
>> +---
>>
>> Is there a way to disable the hook?  Besides this change already
>> being
>> present in the current master (in the main repository, possibly not
>> in
>> my forked version), it is a false positive: it is not a conflict
>> marker, but part fo the markdown markup.
>>
>> +---
>>>
>>> Changes
>>> =======
>> +---[ CHANGELOG.md:9-10 ]
>>
>>
>> _______________________________________________
>> Dune-devel mailing list
>> Dune-devel at dune-project.org
>> http://lists.dune-project.org/mailman/listinfo/dune-devel


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 841 bytes
Desc: OpenPGP digital signature
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20161106/023c5547/attachment.sig>