Git is very useful but not the most intuitive or the easiest tool to use. Furthermore, the code review -> address comments -> approve PR -> merge cycle may take longer depending on the team's workload.
Given we are always on the lookout for more efficient workflows, it's be useful to document our findings on how we avoid merge conflicts, messy git history and so on. We recently came across https://www.git-town.com/. It might be worth documenting our experience with this tool as a way of keeping a cleaner and less error-prone git workflow.
Git is very useful but not the most intuitive or the easiest tool to use. Furthermore, the code review -> address comments -> approve PR -> merge cycle may take longer depending on the team's workload.
Given we are always on the lookout for more efficient workflows, it's be useful to document our findings on how we avoid merge conflicts, messy git history and so on. We recently came across https://www.git-town.com/. It might be worth documenting our experience with this tool as a way of keeping a cleaner and less error-prone git workflow.