getgrav / getgrav/grav-plugin-admin

Set up with Grav (1.7.48) with Forgejo (10.0.0+gitea-1.22.0)

Open
#2,442 0 comments 0 reactions 0 assignees View on GitHub
Dominant language
PHP
Stars
377
Forks
225
Avg merge
11h 51m
Merged PRs (30d)
4

Description

Hello,

I am trying to set up this plugin (2.3.2), through the wizard, but I am having some issues.

Repro steps:

1. In the wizard, fill in in user and token
![Image](https://github.com/user-attachments/assets/18f45d41-78c2-4f2d-aa37-7804e230da8b)
2. Set up repository and branch
![Image](https://github.com/user-attachments/assets/ac2f22ed-e15f-4e0f-9475-ab2ea8e2dfde)
3. Set up web hook
![Image](https://github.com/user-attachments/assets/d3a0deb8-5181-4e71-a32b-e99ce15b9516)
![Image](https://github.com/user-attachments/assets/a21789d3-cf6e-47d7-bf7b-48fa0ed60757)
4. Choosing what to synch
![Image](https://github.com/user-attachments/assets/faa4f976-ca21-4fc5-aa1c-c9ca7a6365df)

However, I get the following error:
`From https://git.labaudric.net/audricd/lapradera_grav * branch main -> FETCH_HEAD hint: You have divergent branches and need to specify how to reconcile them. hint: You can do so by running one of the following commands sometime before hint: your next pull: hint: hint: git config pull.rebase false # merge hint: git config pull.rebase true # rebase hint: git config pull.ff only # fast-forward only hint: hint: You can replace "git config" with "git config --global" to set a default hint: preference for all repositories. You can also pass --rebase, --no-rebase, hint: or --ff-only on the command line to override the configured default per hint: invocation. fatal: Need to specify how to reconcile divergent branches.`

I have run all commands; both with what comes and included the `#` symbol, but:

- No return whatsoever from the commands
- Same output in the plugin wizard

![Image](https://github.com/user-attachments/assets/fb179878-d9c7-46e1-9d74-abb84efc7629)

How can I successfully set up this webhook?

Thanks!

Contributor guide

Open the contributing guide

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.