GitTest for learning git <<<<<<< HEAD master:i'm master 20200920:for test in remote respositiy; dev merge test:merge master and dev, confilct dev1:save branch information dev2:test --no-ff bug:101:test stash