在Mac电脑上安装svn一直遇到如下问题，通过命令 update-reset解决。因折腾了好几天，最终从github找到解决方案，记录下来避免其他人踩坑。

(base) test:Formula test$ brew install svn 

Error: openjdk: /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/openjdk.rb:4: syntax error, unexpected <<, expecting end

<<<<<<< Updated upstream

^~

/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/openjdk.rb:8: syntax error, unexpected ===, expecting end

=======

^~~

/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/openjdk.rb:20: syntax error, unexpected >>, expecting end

>>>>>>> Stashed changes

^~

解决方案：test$ brew update-reset

 

在这之前，还遇到SHA256验证失败，那个只需修改SHA256值便可.

修改：brew edit openjdk

svn Error: SHA256 mismatch
Expected: f9c4a55ac858f858222bc5fe6e4b890f9b4a3f942fd0211575b0418aec5c14d6
Actual: 49a4d0c7849f9b9f957ee96251cf1aefcc88e5c54118929119c7bf9d25754179