Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

多人开发时styles.xml容易冲突的解决方案建议 #39

Open
LuciferJackson opened this issue Dec 7, 2017 · 0 comments
Open

多人开发时styles.xml容易冲突的解决方案建议 #39

LuciferJackson opened this issue Dec 7, 2017 · 0 comments

Comments

@LuciferJackson
Copy link

LuciferJackson commented Dec 7, 2017 •
edited
Loading

如题，多人开发时资源用svn管理，styles.xml经常冲突，要手动去解决冲突，很麻烦又容易出错把某个修改覆盖掉，还不容易发现，要等到问题暴露才知道是被覆盖被还原了。

一个解决方案就是styles.xml中的每个item单独一个配置文件，等发布的时候再把所有item合并到总的styles.xml
这样对用户是透明的，冲突发生的次数大大降低，即使发生，也容易处理，不需要手动解决冲突，只要刷新编辑器然后重新发布一次就是正确的了。
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@LuciferJackson