队友用过时的代码覆盖已提交的代码

Question

它发生在

1. 我的队友重新缩进/格式化过时的代码。
2. 我的队友提交了文件，Github没有显示任何冲突。
3. 我的代码被覆盖了。

我正在使用Github Desktop（MACOS），希望它很清楚。 我知道-ignore-white-space可能会有所帮助，但是我无法在Github Desktop中找到diff选项。

Answer 1

I found the answer, my teammate using different code formatter. And when he auto-format the code, git treat it as he updated the entire part and think my teammate deletes the line as well. There might be some conflict when he try to push, but he completely erase the current master branch without checking (My new line). There's