Conciliation Branch in Git
How to solve conflict to merge staging branch back to master
Tags: git, agile, tutorial