git-lab-merge

git 合併議題模擬步驟 (detail:markdown.md)
1.git clone
2.git checkout relocateFile
3.git merge master (expected: confilct)