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

[Ansgar Burchardt]

Hi,

On Thu, 2016-08-25 at 17:03 +0200, Felix Gruber wrote:
> 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?
[...]
> You can use
> 
> git push --no-verify
> 
> to disable this check.

Thanks, I tried your suggestion, but it doesn't help.  `--no-verify`
should skip the (local) pre-push hook, however my push is not rejected
locally, but by the remote side (the Gitlab installation).

Ansgar
-------------- 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/20160825/cea1809a/attachment.sig>