Know that yours is the correct one? git checkout --ours file/that/has/conflict. Want to merge but know that you want your files to win any conflicts ...
確定! 回上一頁