æ¹æ³/æ¥éª¤
1
使ç¨SVNæ¶ï¼æ´æ°ä¸ä¸ªèªå·±ä¿®æ¹çæ件å°æå¡å¨ï¼åºç°å²çªï¼å 为å
¶ä»åäºä¹ä¿®æ¹äºè¿ä¸ªæ件并ä¸å·²ç»æ´æ°å°SVNï¼å¦ä¸å¾ï¼
2
åºç°å²çªçæ件ï¼ä¼åºç°ä¸ä¸ªé»è²çæå¹å·ï¼å¾å®¹æ辨è¯ï¼
3
éä¸å²çªçæ件ï¼å³é®éæ©TortoiseSVN->Edit conflictsï¼
4
ä¼åºç°ä¸ä¸ªçªå£ï¼éé¢ä¸ä¸ªé¨åï¼ä¸ä¸ªæ¯ä½ èªå·±æ¬å°çæ件ï¼å¦ä¸ä¸ªæ¯SVNä¸ççæ¬ï¼ä¸é¢æ¯å并ççæ¬ãå°å²çªé¨ååèåï¼ä¿åãã
ç¶åå³é®TortoiseSVN->resolvedï¼
5
æ件ä¸çé»è²å¹å·æ²¡äºï¼ç¼ç¨ç红è²å¹å·ï¼è¡¨ç¤ºå²çªè§£å³ï¼ä¸SVNä¸çæ¬ä¸ä¸è´ï¼
6
éä¸æ¤æ件ï¼å³é®ï¼SVN Commitæ交å°SVNï¼
7
å¼¹åºæ交çªå£ï¼çå¾
æ交å®æï¼
8
æ交æååï¼ä¼åºç°ä¸ä¸ªç»¿è²çå¹å·ï¼è¡¨ç¤ºæ交æåï¼å²çªè§£å³ï¼
温馨提示:答案为网友推荐,仅供参考