If your fix for issue #53 modified the same part of a file as the hotfix , you'll get a merge conflict that looks something like this: $ git merge iss53 Auto- ...
確定！ 回上一頁
