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

[Ansgar Burchardt]

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 postitives that are triggered by existing code in
DUNE?

Ansgar

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 ]
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: This is a digitally signed message part
URL: <https://lists.dune-project.org/pipermail/dune-devel/attachments/20160906/5e231efb/attachment.sig>