iphone - iOS开发smartsvn同步,从trunk merge到branch时,冲突解决器里面出现乱码
迷茫
迷茫 2017-04-17 11:07:38
0
2
833

如题。
同时,branch修改完成后,想merge到trunk上,却是没有问题的。
我用的smartsvn是一个破解版的smartsvn6.6.1,在csdn下载到的。网上有人说中文乱码的解决方案是,修改字体为中文宋体什么的。但是我按它的方式打开后,发现根本没有中文字体(见链接http://my.oschina.net/null/blog/7913)
不知道大家有没有遇到这种情况?或者说,大家用什么svn?或者是git?

迷茫
迷茫

业精于勤,荒于嬉;行成于思,毁于随。

reply all(2)
黄舟

Svn has been used before. Recently, using sae requires svn deployment, and I found that it is basically useless. So now I use git to manage even svn (git svn).

As for the tools, if you are interested, it is still necessary to understand the command line, whether it is git or svn.

With GUI, XCode can manage svn and git, although the functions are a bit simpler. I think it's enough if you develop it alone.

For git, there is a free gui tool that is great, SourceTree. This also supports svn, but it is managed using git svn.

I forgot the name of the free svn gui tool. @gaosboy Jiang knows it

刘奇

Try changing the file encoding to utf8
Git also seems to have a problem with Chinese garbled characters. I have been using a utf8 branch version of Tortoisegit before, but I don’t think it will be updated later.
I have been using git svn before, but it seems not as convenient to use as Tortoisesvn. It seems to have all the functions, but it is a bit awkward to use

Latest Downloads
More>
Web Effects
Website Source Code
Website Materials
Front End Template