Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GitSync - hub/lab #240

Open
taslabs-net opened this issue Sep 1, 2024 · 1 comment
Open

GitSync - hub/lab #240

taslabs-net opened this issue Sep 1, 2024 · 1 comment

Comments

@taslabs-net
Copy link

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
Copy link
Author

Any change to work on this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant