Platine, vinyle
Bons avis mais pas d'avis personnel
Magasin de vente, à destination des professionnels, de nourriture, boissons, etc.
Merci à Hubert pour le partage
Magasin à Forest et Wavre
Publicité présente sur les écrans JCDecaux de la capitale belge
7.9 Git Tools - Rerere
Rerere
The git rerere functionality is a bit of a hidden feature. The name stands for “reuse recorded resolution” and, as the name implies, it allows you to ask Git to remember how you’ve resolved a hunk conflict so that the next time it sees the same conflict, Git can resolve it for you automatically.
There are a number of scenarios in which this functionality might be really handy. One of the examples that is mentioned in the documentation is when you want to make sure a long-lived topic branch will ultimately merge cleanly, but you don’t want to have a bunch of intermediate merge commits cluttering up your commit history. With rerere enabled, you can attempt the occasional merge, resolve the conflicts, then back out of the merge. If you do this continuously, then the final merge should be easy because rerere can just do everything for you automatically.
Who is this guide for?
I have tried to make this guide to be a comprehensive collection of the most basic yet essential tips with a set of actions and best practice steps that should be applicable to all types of Zigbee setups, regardless of what type of Zigbee adapter/gateway/hub/bridge/devices that you are using.
This guide is meant for both those who are new to Zigbee as well as those who been using Zigbee devices for years but might not been aware of the underlying prerequisites to optimize for stability and performance.
It has been written with a point-of-view in mind of Zigbee solutions that use a Zigbee Coordinator adapter locally via USB dongle/stick or remotely using a serial server over a local network, etc. and as such it definitely applies to all users of Home Assistant ZHA integration 258, Zigbee2MQTT 188, and deCONZ (Phoscon) 84.