1、1.導入項目MyEclipse中的SVN操作手冊進入下圖亡-*tty弋口擊川、riwwim護Iport岡SelectCreatEarLewprujectbycheckingDut:itlexistin巨prujectrumaEV1JJrrep口呂itory.LSelect：=ltlimportsom-ce:typEfiltrs-:-:0-:0-:曰+G33GGetlefqICVSIl注tataseFlug-irLBevelupmerLtGSWCheckoutFroject三fromSO業二WebServices亡-*tty弋口擊川、riwwim亡-*tty弋口擊川、riwwim點擊Next進圖

2、下圖點擊Next進入點擊Next進入輸入用戶名/密碼用戶名：你的姓拼音（如：張三，則用戶名就是：zhang）密碼：“oa”+你的名字拼音（如：張三，則密碼就是：oasan）（注：后面所用到的用戶名/密碼一樣）成功頁面2.更新（更新到最新版本）AddIII皿/38丄OAObject.javabISTShciwTreeConflict呂AddtoVersionControl目巧ImportSetProperty.Ctrl+VShijwPropertiezBuildFathScmrceAlt+Shift+SRefactorAlt+Shift+TCopz，.Export.K奩IConfigureBr：

3、iiLchHE/T：gE.FrofileAsCompai_eWithLeletDeleRevisionGraphr?占Exprt.Editconfliute.M：=crkResolved.ReplaceWithRestare1-amLac：ilHistory.MyEclipseFIiETools.鎖（對要修改的文件加鎖，防止文件沖突）FrupertiesAlt+ETLtmFOJi/:已匕丄i口s已;it已vision2CA-rHEAD一一forceClueFrujectAssignWorkingEmte.Cle:iiLUpDiscoriiLectpackageco:AjiplyFateh.Ct

4、rl+C卻ShowHi弓to巧UjniatetoHEAllNewGo工nt口UpdatetoVersion.CreateFateh.Sj-TLctii-onizewithRep：eitoryCorTirTiit.OpeninNewWindowUpenTypEHier：ii_chyEhtjwIn虐CopyCopyQualified.lT：ajrieE廣aiLC：h./T；玄舀YMergp.gwitchto:tli：iBr：rLchi,lTai,lRHvision.F4Alt+Shift+W-E八+L由“*JKE+J2E5畝“帚WebI:PackageExp氷0a.obiectL.tjmnnt.A

5、pplyF：Qtch.UfidatetuHEADtuVerEiun.CuQtmF：Qtch.BrLch/Tag.Merge.Switchtu：tlutherBr：TLchi,1Tng/RevOjerLF3OpenWithkOpenTyp己HimrarchyF4ShowInAlt+Shit+Wk諺CopyCtrl+CCopyQualified.WamE:EasteCtrl+VXDeleteDeleBuildFathSum-ceAlt+Shift+S卜RefacjturAlt+Shift+Tr?nImport.r?詢Exprt.RefererLceskDecl-ationsk您RefreshF5A

6、seignWurkingEmte.RijilAeJDebugAsFrofileAs卜T旦:UTl1CompaieWithReplaceWith卜ResttjKEfrumLuc：ilHietur藝.MyEclipse卜Alt+EnterFrupertiesSystemLihr：ii-yLMyEcl1p+J2EE1.4Libr：ii-ies+.fWebRijut罰Show電少ShuWJ：ShowShowShuWShuWHistoryTreeCunflict呂Froperti半Atitlutzticm.Luc：ilHiettjFyrAddtoVersionControlLock.Addtoeto:i

7、griSetFroperty.Urtl3ckCopz-Export.4.提交（項目修改后的提交）被修改后的文件樣式具體提交圖示5.解鎖packagecuin口a乃iect;Ctrl+CCtrl+VDeletHAlt+Shift+SpulilicclassOAOJi+BiJRESystemL:-aJ2EE1.4Libi由&w“Flm+-Alt+Shift+WSjtlelm-cmizewitRep口三itnryCummit.UjidatetoHEAllUpdaVerEiurL.Creach.ApplyPatch.BiiiLch/Tag.YMerge.SwitchtaarmtherBriich/Ta

8、g./RevieiUt+5hift+THi呂tn了TreeCorLtlicFropertiesRevisiutlGraphAtlTli：it：mtimLi：n：lMimtu了Te：am6.查看歷史修改CompareReplaceFH.oreWithWithCopy.Export.fromLoc：dlHie.|J|0AObjert.jMWpackageconi口a上ijec匸；MyEclipsepulilicclassCAObjectString匚1匚1=吹爰方的說法者b是；Jr沖航的+5J2EE1.4LiWebRuotOjienF3UpenWith卜UpenTyp已Hier：di-chyF4S

9、howInAlt+Shift+tf卜(HlCopyCtrl+CCupyQu：dlifiedN：dine走1FasCtrl+V翼DeleDeleteBuildFathSum-ceAlt+Shift+SRefactuFAlt+Shift+T卜r?Impurt.RefererLceE卜Decl：di-atiure卜疳;,RefreshF5AssignWorkingSets.FlUTlDebugAetrumKepueitoryRevisioil.BriiiLch/Tag.P-ai-KFl+k7.文件還原|J|UAUbject.java近Il+l5FackageExpHier:ii-chy+JKE劉毗沏

10、Lib由.*J2EE1.4LibraWebRijotpackagecoiri匸iaject-;pulilicclassCACfcijectStringdd=rr雙方的說法都是;F3Ctrl+CCtrl+VIieleteAeeiETlriorkms5mte.Alt+5hit+5卜Alt+5hit+T卜UjienOpenWOpenTypmHiF4Alt+Shit+W卜ffi9ImagePrevie想、?叭Impurt.爲國Er?詢Expurt.雙擊時間查看要恢復歷史記錄日ARevisionTimepulilicclassCACtoiect.pulilicclassCACfciiect.Replac

11、eC:eltli：elCoMpareStringdd=PP?.S.方的說法都是;JavaStrueturmCorrip：=Q_e/OA/sre/com/oa/object/OAObject.java0|jjCumpilatiunUnit-LlAOlijectdd:StringBLocalHisjtory(4/11/1111:12AM)packagecuni口a上ij已ct.;JavaSourceComp：=Lt_eWorkspaceFileI)ackagecorn匸ia上ijeer.；4/11/1111:12AMs4/11/1111:13AM4/11/1111:19AM目4/11/1111:2

12、5AN4/11/1111:3UAN文件沖突1.什么是文件沖突當兩個或更多開發人員對同一個文件的某幾行做了修改，就會產生沖突。修改此文件然后進行更新提交成功。index,jspc:ut.va1ue=rrSp:也修改此文件2：dlerLd：dI-.htfTiM1IJ-izell.jsp210-9-2zellRight.jsp210-ellSingle.jsp21(zrud.jsp2lU-d-E_zruduEer.jsp21U-1；2zec.jsp21U-9-2_late,jsp210-9-2_lwbrTi_i：irLch：dTLge.jsp2srror.jsp2lU-d-EfillF：rr.icr

13、.91I一口一j*index,jspKs|=lVEEver.seckibkikikikikikikikikikikikic:ut.value=pr5par；5Ltifr：5iiieset匸ws=rr*0rpb匸de匸=fEiziineiiiiune=MainF匸ame：rrsr在在對文件進行更新時，就會產生下圖效果這就是沖突效果ji：ummcmcummcmIi2i：irTirTn：iri2222corTirTion13index,jsp1910index,jspi:idex.jsp.r18iulex.jsp.r19jliflLsr.jsp610vEsver.see2bt.jsp210-9-210cell,jzp2lO-d-EcellRisht.2H2.文件沖突解決辦法把其中一個人改的刪除cummuncummuncorTirTii：iri2222corrimon-jeflLEr5-H-fhsv-H-rs:帚宀index,jsp1910jsp6lLl-scc21U-10-9-2Tlcalend：di-1U-1：elc10-9-2ellRight10-ellSingljsp21(-Jdurc10-9-2O-iu-g-2解決沖突后進行提交incli.idefile=pp/co匸已匚口已日匸s已t.Charac匸已匚Eresponseset.Headeri