/domoticz/plugins/Domoticz-Zigbee $ git pull hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
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.
remote: Enumerating objects: 263, done.
remote: Counting objects: 100% (69/69), done.
remote: Compressing objects: 100% (23/23), done.
remote: Total 263 (delta 56), reused 46 (delta 46), pack-reused 194 (from 1)
Receiving objects: 100% (263/263), 1.13 MiB | 5.96 MiB/s, done.
Resolving deltas: 100% (152/152), completed with 19 local objects.
From
https://github.com/zigbeefordomoticz/Domoticz-Zigbee
8694b202..af1d9e18 stable7 -> origin/stable7
* [new branch] rc-stable7-7.1.021 -> origin/rc-stable7-7.1.021
aed129f1..22622ec8 wip-develop-7.2-2025 -> origin/wip-develop-7.2-2025
* [new tag] stable7-7.1.020 -> stable7-7.1.020
* [new tag] wip-develop-7.2-2025-7.2.110 -> wip-develop-7.2-2025-7.2. 110
* [new tag] stable7-7.1.018 -> stable7-7.1.018
* [new tag] stable7-7.1.019 -> stable7-7.1.019
* [new tag] wip-develop-7.2-2025-7.2.107 -> wip-develop-7.2-2025-7.2. 107
* [new tag] wip-develop-7.2-2025-7.2.108 -> wip-develop-7.2-2025-7.2. 108
* [new tag] wip-develop-7.2-2025-7.2.109 -> wip-develop-7.2-2025-7.2. 109
Updating 8694b202..af1d9e18
error: Your local changes to the following files would be overwritten by merge:
plugin.py
Please commit your changes or stash them before you merge.
Aborting
patrick@raspberrypi:~/domoticz/plugins/Domoticz-Zigbee $ git checkout rc-stable7 -7.1.021
error: Your local changes to the following files would be overwritten by checkou t:
plugin.py
Please commit your changes or stash them before you switch branches.
Aborting