合并报错怎么解决

[q1518001822]

希望可以在合并检查后报错原因下增加对应的解决办法说明

[mifi]

I hope to add corresponding solution instructions under the error cause after the merge check.

Unfortunately there's usually not many solutions other than:

1. manually re-encoding one of the files to match the other
2. try and see if it works