結果 : how to avoid git pull conflicts