Ha - goes to show how often I've used git recently...... Which is to say "Not much!"
I've just used git to update dwm on my work PC and got the warning message that
@cheepie is getting.
That is apparently because git's behavior when pulling has changed.
Previously git would do a merge by default - unless the user specified another action. Apparently a lot of git users found this sub-optimal, and wanted a way to specify which action to take by default. So now you should specify the default action by setting
one of the settings specified in the warning message.
So to get rid of the first warning message - about reconiling divergent branches - you need to run
one of the following commands to set the default action for pulling:
Bash:
git config pull.rebase false
That is the setting for the original, default "merge" option
Bash:
git config pull.rebase true
That is the setting for "rebase"
Or
Which is the setting for "fast forward only" - which is apparently what many users prefer to use.
Personally, I've always been happy with "merge" by default.
NOTE: Using
git config
will only apply that setting to the repository you are currently in.
If you want to apply it globally, then use
git config --global
to set the setting instead.
Choosing and setting
one of the above settings will set the default action to use with
git pull
and will prevent that warning message from appearing.
Also, once you've set the default action - if you ever need to override it and use another, you can specify it.
So, for example:
If you've explicitly set git pull to "merge" by default, globally. And you want to do a fast-forward in the repository you're working in. You can override pulls specified, default, global "merge" action like this:
And for that pull, you will use the "fast forward" action instead.
I've never seen the other error messages though.
From a quick bit of duckduckgo-fu, it seems to be related to an attempt to push to a non-bare repository.
Apparently github and gitlab repos are bare repositories.
I'm not sure what to suggest with this. I would need some information about
@cheepie 's remote settings for their repo.