还剩4页未读,继续阅读
文本内容:
一、COMMIT提交并推送到远程Commit andpush只提交本地Commit提交信息必须填写§空皆dQ FilterfilesI\busimng[master Tl]UnstagedChanges0Commit Message必须填写StagedChanges1areadme.txt-src/main/java/com/ai/frame Author:王威-亚信王威亚信Committer:-Commit andPushf Commit
二、PULL拉取远程代码到本地,若当前开发分支涉及多人参与开发,一定要定期进行取保持与远程代码一致!避够后续时存在过多冲突!PUSHJava-busimng/src/main/java/com/ai/frame/readme.%Package ExplM]busimall/pom.xm system.propertiOpen inNew Window►yS1a Web1本包下是根据ecpcore层的wsdl地址反向生成的jc►y:]basiccon OpenType HierarchyF4►j bms[bms i►gi1Show InX3SW►busimall®Copy3€f busimng[O Commit...官CCopy QualifiedName,^src/maii用Stashescom.匕用以®Paste守Push toUpstream▼对「X Delete4Fetch fromUpstream►0令Push Branch master...►5i tRemove fromContext\Q1护PullBuild Path
④Pull...SourceRefactorRemotes缴Switch To说Import...v2P src/mair►L ii1l Advanced恒confi►Jjsprin►iqj Export...strut制Synchronize Workspace四RefreshF5扇Iog4j JbCloseProject MergeToolstrut yCloseUnrelated Projects雪strut Merge...A际JRE SysAssign WorkingSets...►最Maven JRebase...Run As曲Reset...[►£jjsrcDebug As►L targetProfileAsCreate Patch...回pom.xm[y!ValidateApply Patch...readme.Team►目bWeb〈目Compare WithRemove fromne▼踹〉ecp[ecpReplace WithIndex电j Ignore▼用src/mai【►—Restore from Local History...confi►Cjjsprin►C回Show inHistoryMavenfci strut凰Java EETools Show in Repositories ViewH log4jConfigureA/Init Git FlowbusimngZ DisconnectProperties
三、PUSH推送本地分支到远程!注意前一定要进行操作,避够版本不PUSH PULL一致造成的冲突(请参考)4uava-iy/32/iiiain/java/cum/ai/11amc/1cauinc.iAi-cuiip^c-/UJDI〉/waiNewGo Into笈PackageExplorer msystem.properti Xspring-servicesOpen inNew Window层的地址反向生成的代码,不要在此包下开发►aWeb KpcQrewsdl java►§j|basiccore[basiccoremaste OpenType HierarchyF4专►瑞bms[bmsmaster]Show In7邦W►►busimallbusimng[busimng masterf1眄Copy Commit...▼src/main/java.Copy QualifiedName Stashes田▼com.ai-Paste守Push toUpstream►dBecpX Delete8Fetch fromUpstream▼,QframeA Push Branchmaster...►^IControlService.jiRemove fromContext►.IControlServiceH►J]Build PathIControlServiceL►SourceIControlServicePi►Refactor RemoteIControlServicePiaMImport...麴Switch ToI GitStaging区readme.txt弋:,Export...Advanced▼i src/main/resources►昂config的Synchronize Workspace蜷Refresh F5►ispringClose ProjectMergeTool►i strutsCommitIClose UnrelatedProjects常Merge...,Iog4j.propertiesAssign WorkingSets...struts.propertiesy struts.xmlRun As►,JRESystem Library[JavaS►Debug AsMavenDependencies►ifisrcProfile AsCreatePatch...►13target的pom.xml ValidateApply Patch...熔readme.md Team►yi bWebCompareWith飞Remove fromIndex团►温〉ecp[ecpmaster]Replace WithAuthor:Ignore.弋src/main/resources RestorefromLocalHistory...Committi JShow inHistoryMaven►Lj config匐ShowinRepositoriesView屯Java EETools►2springConfigure►L•,strutsZ InitGitFlowZ,Iog4j.propertiesProperties Disconnectbusimng注意在过程中不能选择之类的操作,PUSH FORCEUPDATE FORCE,意为强制进行推送,若本地分支和远程代码不一致,选择此选项会UPDATE强制进行覆盖!严重造成别人提交代码丢失!切记!如图所示PushBranchmasterPush tobranch inremoteSelect aremote andthe namethe branchshould havein theremote.Source:备master4^fb9a941增加提醒!Destination:Remote:origin:New Remote...Branch:master,Configure upstreamfor pushand pullWhendoing apull•Merge upstreamcommits intolocal branchRebasecommits oflocal branchonto upstream切记不能勾选Force overwritebranch inremote ifit existsand hasdivergedShow advancedpush dialogBack NextCancel Finish
四、提交代码错误解决方法
4.1rejected-non-fast-forward今天在中使用上传项目时出现如下错误Eclipse Git通过查阅资料,发现是文件冲突问题,即本地和远程的中的文件出现了冲突所致,重Repository新检查了一下,发现是在建立时,,添加了文件,导致和本地得项目分Repository ReadMe.txt支不一致错误:rejected-non-fast-forward错误原因文件冲突,本地的代码和远程中的文件个数不一致(即远程Repository中存在本地项目中不存在的文件)或本地得项目不是在远程Repository代码的基础上修改的Repository解决办法将远程中的代码更新到本地,然后再进行,即可完成代码Repository PULLPush提交。