search

trilbymedia / grav-plugin-git-sync

Collaboratively Synchronize your Grav `user` folder hosted on GitHub, BitBucket or GitLab
Apache License 2.0
245 stars 57 forks source link

GitSync - hub/lab #240

Open taslabs-net opened 2 months ago

taslabs-net commented 2 months ago

From https://gitlab.com/taslabs/grav-static * 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 am baffled. It logs in fine clearly. When I go into directory 'git status' says not initialized, like the plugin makes a new folder, or doesn't make one at all?

taslabs-net commented 1 month ago

Any change to work on this?