git-flow belajar git bersama-sama How to resolve conflict clone this repo create new branch edit index.html commit your work push PR to branch sprint