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

[Felix Gruber]

Hi Ansgar,

On 08/25/2016 04:57 PM, Ansgar Burchardt wrote:
> I cannot push some changes to dune-typetree in my forked repository. A
> pre-commit hook rejects the change:
>
> +---
> | 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 ]

You can use

git push --no-verify

to disable this check.

Best,
Felix


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