Git Branching Strategy

One and a half years ago, one of our clients was experiencing serious deployment problems like on lot of merge conflicts on every merge,​ ​production database scripts and committed scripts are different resulting in wrong data schema, etc We analyzed and concluded that root cause of problems is poor branching strategy. The client asked us to suggest…