--no-rebase on git pull

Koenkk / zigbee2mqtt

Zigbee 🐝 to MQTT bridge 🌉, get rid of your proprietary Zigbee bridges 🔨

https://www.zigbee2mqtt.io

GNU General Public License v3.0

11.2k stars 1.6k forks source link

--no-rebase on git pull #22395

Closed rbswift closed 2 weeks ago

rbswift commented 2 weeks ago

Pulling without specifying how to reconcile divergent branches is discouraged and produces an ugly "hint" that can be a little disconcerting when running update.sh

Koenkk commented 2 weeks ago

Thanks!