Where can I find info on this?
I did an update of all elements and in the completion window it gives you a list of what it did and then I had a few hints. You cannot do anything with them in this window so I simply copied them. I would like to know more about these but in the documentation I cannot find specific reference to these.
hint: Pulling without specifying how to reconcile divergent branches is
07:03:17
hint: discouraged. You can squelch this message by running one of the following
07:03:17
hint: commands sometime before your next pull:
07:03:17
hint:
07:03:17
hint: git config pull.rebase false # merge (the default strategy)
07:03:17
hint: git config pull.rebase true # rebase
07:03:17
hint: git config pull.ff only # fast-forward only
07:03:17
hint:
07:03:17
hint: You can replace “git config” with “git config --global” to set a default
07:03:17
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
07:03:17
hint: or --ff-only on the command line to override the configured default per
07:03:17
hint: invocation.
I tried searching on some of the terms but nothing comes back that looks relevant.
What should I do with these?
The update procedures use git commands during the updates.
Apparently, something has happened that git did not like, and it gave you some hints to avoid it in the future.
As to why this has happened and whether you now might have a problem, it is unfortunately beyond my mastery of the dark git lore.
If it is beyond you my dear Sineos, we need the all knowing oracle of klipper. But being a mere mortal myself, I don’t dare to conjure him up
My brother, who is a Red Hat linux engineer, amongst many other linux related magic, claims he knows what it is, but he is currently on another mission so I have to wait before I can share it here.
To avoid any issues you could try to git reset --hard origin/master and if this does not work, then take the brute force approach of deleting and re-cloning the repositories.
Brother says the following:
Git uses local and remote repo’s. It will try to keep them synced to prevent conflicts. Local repo’s are supposed to be read only. changes on the local side are not allowed to go to the server, only from the server to local.
In my instance git found a local repo which have changes that git does not understand how to deal with, as such it gives hints as to how to prevent those in the future.
Unfortunately it does not tell us which part or repo caused the problem, just indicates the problem, which could be anywhere. It will be hard to find exactly what that was unless you are very deeply involved in these git commands.
In my case the update was successful, and all my elements indicate they are up to date. I am now printing a part to see how it does and it will either fail or be a success.
I will not worry too much until info comes my way that clearly shows I will have to solve this.
Thank you for your reply as always. If it fails I will be back
