If origin file have trailing whitespace but new one doesn't.
You'll meet the error 'trailing whitespace' when you try to apply merge patch.
Use the comman git am --whitespace=fix <patch file name> to work it out.
It'll ignore all confict by trailing whitespace and do not merge those line.
沒有留言:
張貼留言