About Command
Team Discussion Notes
Recently, our team will implement GIT as a version control tool instead of the TFS, our usual tool. Regarding hotfix and feature dev, we have found a good way to conduct our workplace principle:
(Thanks to Citizen Developer for this very clear diagram)
The main reason is that if a hotfix is merged into dev first and then into the main line, some of them that are still under dev testing may be accidentally thrown into the official environment. Therefore, the best practice should be to merge into main (master) and dev separately.