Eclipse中git的基本使用

1、、安装EGIT插件二、使用EGIT前的配置三、新建GIT仓库四、配置.gitignore 文件五、查看历史记录六、推送远程仓库七、远程GIT仓库八、解决推送冲突九、重置功能一、 安装EGIT插件，搜索现在的eclipse 一般都自带了，如果没有，使用 Eclipse MarketplaceEGitElapse MarketplaceiLc-rbErwi b= anahMll.Annli be artM-rBct mtfr* mfualLcn.fc eji the ink- iiib. r -itt js delJileJa d -a nklu - -Mtink mt yi*.H.*carf l

2、pulhr Imladlvd!DvEmb*r INavn heiwr |RjriatJyi &vL_ 201?一Eljft狂 M.Al Mdikflt-；彳AJl CvlDg&riM.fey gd也斗m;. trLIDE 童 皿叭击b 科I#34* le 士 h.IrwtiiME&rt - firt linttfraftifin for Eriip* 4.S.DEC)i蝕 决 me innp$f妇p fclipP i.磺整li显眉日 即无0佔旳 州营 whicfi ma, -mwr !* pw hai, Cut coay af d fairikEMy dJ -mravy rwHiiiEn a_

3、. nWHPB infobyEFLAftSE mu)：.Q0*1 k. 4MrK(1P?27liiFE mo柑)临伸Rnw hlMrahrHvMarketplaces使用EGIT前的配置配己置个人信息，最重要的是 和user.emailPrefere nces Team Git Con figurati onadd Entry wy*Plugi-ln Dwl口旳皿 lk tHANI恥fiw *wrrw闫丿低扫吨*in 呂* TMffl-:FIh Convant-GrtLiacjfljcm:ri!lAl,-rir,iah-vfe3rlrEjpltaf!Ar=BTT|rVikeJ

4、9TLX33 世T 牛 CQ E2pOp*A4J EwplpCoTpiC! ygnftpi屛msDace FofFThKHrtnryswifriJrarLeFjaicra Qariau feaVnddN Cfeche 10心汕雋曲W*三、新建GIT仓库新建hh_monitor项目 Spring - Spring Tool uitefile Edit Source Refactor Navigate Search Project Tomcat R r3 Jl 9 v 您阚超遇棉 骨 Patkge Explorer S3 J Navigator -爲 l 1-1 戸._I 2ndquadrarit

5、_bdr匸hh_filedbv 7 hh_mQnitor 5 wtv r WebCorrtent logMETA-INF 2 resource三 views 匕 WEB-IMF D w?kO hh_5ignO hhjtaskO hhadbjavaec_basic二 hhadbwebadminD packagecoreQ-A二 po5tgre5C|l-bclr口 SpringMVClu we-b_adminFile Team Share Project 选择 GIT5 hjiff PmjertShare ProjectSelect the repository plug-in that will

6、 be used X share the selerted projectSelect a *eposiTory type：/鈕hexl CancelRepo-? 1orCaaecICenfifUfc Git FUfeiitcfySelect reptminry locoliarl回JUteLFBitB zposim厅 inIddtr 对 projectLocstic臼 -_j illjtc Cfc:liIP Dje-rtW rks-!|hli_roon rtoritcryPrDjectWorks hh mcrritor.i卅*访闰名秫A修改日頤branches甸 16/1 2110:58ho

7、oks2016/12/2110:5&log2016/12/211058t*olbjerts2D16/12/2110:58refs2016/12/2110t58文朕Driven config2016/12/2110:5B文件HEAD2016/12/10:5&我件同时，eclipse中的project也建立git版本控制，此时未创建分支，处于HEAD犬态7 “J hh_mcniter hh_monitQr NO-HEAD if?、皿* t ? = WebContent7 = leg，G a META-lhF resource口 views.? W/EE-INF文件夹中的符号” ？”表示此文件夹处于

8、untracked状态，这样就成功创建 仓库。四、 配置.gitig nore文件配置.gitig nore ，排除不需要提交的文件。NO-GIT此时我们尝试做一次提交，Team - CommitU Commit Changes匚ammit Change*is to Git Ftepositor Enter commit mcisage,1Author:zzp 耳耳nrpqqaKjrYiiOfseo jiC SUiriy viewConnmit and RushCurTirntCommiitter! szp 疋xnrszpqqucom Filat (0/606)Erglypt: fllle-

9、trJrt5皿PothAwork/cirg/m p a che/jispjvi e w巧j e p/o匕勺 百ervi z b :p j p d tjs p j avaworltcrg/ apa 匚 he/jisp/vie p/ssvipjs p .d awork/tpa c he/js pAi wR ip/servi c e/ser/keQr j pjp .j 斛 a)flrg/apa chc/jip/vi ews/l oginjsp.rg/apath#/jsp/ui#w4/lDginjsp.ja?-ra11 |*?iwofbcr g/jpd Lheyp/viIco me_ip. class

10、worldsrg/a p n che/j 5 p/vi ews/we Ido rnejspjaa如上图所示，Author和Committer会默认为Git配置的用户信息下面的Files窗口中可以看到此次提交的文件，其中有非常多带有 work的文 件，此时，在我们的project中链接的work也被GIT默认到版本控制中了。work下面的文件不需要进行版本控制的，我们可以通过配置.gitig nore 来排除这这个文件夹。打开Navigator窗口，在project根目录中添加.gitignore文件，将需要排除控制的目录写入.gitignore 文件中匸 Spng - l rrwr 占erri

11、ng卜兮許six VJebContent uucrk斥 d&paEhgHigrnreu a u 口gT .mnwtiHclala 丹.projectF t-i.tp ugin hh tiqn h卜估耳k hfwdbjflVME.bai X hhadb.webanJn p4*rk戰pe rr耳 眄t*xqlbdir SprirgWC wb edm；n再次尝试commit，需要提交的文件已经被过滤厂 CommitCommit Chang to Sit RepositaryQ) En-ter commit rnsageAuthor;zrp /nta.M7T o nizingFo rrriitt*rj

12、ava arc/ioim/HI /ji/tcjitpancr/iyhtaUpdlflLeDrrivedTaNcrStr Erc/ccin/lhlh/u i/uti I/Cdti o on cHelpxerj sru/commcnra ction .xml src/ccmmorr- iQg.xinl srr/hh-sqLsrml 屮叮ve心idn.Ltt- Oaen Git Sag j viewCommi： and RushCcrnmitCancel首次提交后，会自动生成 master分支* 粤 srcv B WebCo nientlogMETA-INFresourceviewsWEB-INF

13、Q-.- work然后在com.hh中新建一个文件，可以看到图标依然是问号，处于untracked状态，即git没有对此文件进行监控。y 詁* hh moriitor hh monitor master v 3 srcv 咼 n co-m.hhJf testActionj ava 册 CQm,hhdminctiQn 出 com.hh.admin.entity 38 cQrriihh.dmin Jntrc&ptr 出 tam.hhradfhin.?ervic? :+-匚omihh心cknirbshdrud，卜 com.hhdrnn.util通过Team - Add to index 可以将文件加

14、入git索引，进行版本监控r H ImpcrU.iCcmmiJGUri+*Rrlerncn-1dhp-sncrd W - - E -” T I涉加Fe*hF5gyfc | 0QIShow Locit HistoryAjiigfl Warfeng SetPetek.,Run MApply Puck.Orbugi Ai|i*AAdd 6& UrvdenrAtilgmreRevtorv fnnm LocH Hritar,SKow in lihiiyWbW*cw in韜平g打Q!#斗 轿&hcw ArneKatiBin.CornMre Vi甜iPS:可以看到图标显示也有了变化（EGIT中只要Commi

15、t就可以默认将 untracked的文件添加到索引再提交更新，不需要分开操作）也可以通过Team - Un track将文件从索引控制中排除。将此次新增的文件commit到仓库中，文件将处于unmodified状态，或者说, 这就是一种staged状态v , - hh montorrih monitor master7 山 com.hhjJ testArtiQnjavg然后修改文件的内容，文件将处于modified状态v J a hh_monitof hl _moni:o ridV罔n皿v 3S ? com.hh? U = t&tActionjava可以查看版本历史提交记录五、查看历史记录Te

16、am - Show in historyProfile AtValidalipRtore froir LoclJ History.-ICHTKlt |prDjt* fl氏how ffl HicfniyShow 济VwUpudit PpcijMfc-.-二- 玉 PugLF电 F. Pchl叭目 History 滋匕（n-Pypj.ru hh jm-ntto* hh mnitarIdMemftgeAuriid-rAutlioned ate JCommitted maslOF jHEAptetSp9B tecands ago 22pBfi econd jgo54離曰5 Remoto-Pushf W

17、UArtkirt VMl nrft |汀 MiT4 IN町 *HMK I*pn ar* New 梢AfTIEfTnpe ierwchyc myti nrHn Mtncr itwfrCf*r壮耐切理Pirtle BfMCh-.hlJadkXEt岸W1OillfWRIPr-“ r - j-?-1 h.fhhacNb wvhadmHbiikiw mcMvi 4. triwnSrtEft TpMrkAB * J3 rw4Bum f卜fch*M：*dpcilqrnq -bdr!kmvRlKlDiM+UKT *wvtivitnirFfgl1tdLapwL.Mqpan FdiMWnFi ujd 理Khcl_

18、CIm*Owlr Mckk_Wortang ltK_idk_RiAlA *Ariij to hndlMiCMf *ntVtbw韜1, r4 i ItawCiSriigijnf- 5fF-ng Rvci*UR1：hh121.42.15237:/nome/hh/db deveop/hh moritor.gitLocal File-Host:12142.152.37I Push to Another RepositoryDestination Git RepositoryEnter the ocation of the cestiration repository.LocatiorRepositor

19、y path: /ho*ne/db_develop/hh_mon；tcr.gitConnectionAuthen ticationFinishlto： originPuch Ref fpocificatincSelect refs to pu&huAdd predef need specificationAdd ersate/update specificationSource ref：OestinatiDn refsAdd SpecAdd SpecAdd Alli Branches; SpecAdd All Tags SoecSpecifications fcr pushModeSource

20、 Ref牛 Update reE/heacs/sterDfstmabor AeForce UpdateFemoveref/heasmasterFdilc Upddle Al Specs Lx Remove All Spei0Sa/e spedfications in brig rT configurationFinishCarcfl完成推送后，弹出如下界面U FpsijIts: hhtDI 21.42 J 5Z.37:/horre/H7/clb_dewcpj,1ih_monilnrgirXPushed to hhlZI.ISZ.BTj/home/hh/db developnih mcnrtor

21、.gitrnster r master rew branch=1SiNesa-qe 3氏耳 Is.Reposiiory hh 121.42.1 $2.37/honre/hh/dbdevelop/hhmonhor.g(to Q C&_adrriin master - DAPrvjertWon! 0 hh monrtor master - iProjectWorkshh monitorVgitJ SpringMVC mastFr - Df.roject/. ork5prirgM C,gitQ - web ddmin maste-J Z1:,? irej ?ct/. rlcseD_a d mi n,

22、gi lLocati onV Clone Git RepositorySource Git RepositoryEnter the location of the source repository.Protocol:Port:Authe nticati onFinishCancelFile Edit Navigate Search PrCijertRun Window Help團 &t Repositories 3 IBS?盘之用费嫁短毎= ,r aiiaiiama aBiiijiin nu uji Iim jiii = iiilun iuj m uibiiijiib: uui 4i iha

23、uii uji nijuis bii: uji numi iuj niii m nu :Q - 2ndquadrant_bdr ；bdr*pg/尺EL9_4_STABLF D:ProjectWorlcHNrciqusd- cs_.admin rr- aster - D; Frojeci.-k5cs .adrrin .githh_monitor master - D:PrqjectWorkshh_monitorVgilv 蔚 Branches_L L_P亡白I鶏 master &3d24cbtest当前分支v 、. ： Remote Tracking鞫 origin/master J jd2-c

24、.i:e- t烏 TgsQ References Remotes J Working Tree - D;ProjectWc-rkskh monitc?r Q SpringMVC master - D:ProjectWoclcsSp rirgMVC.git web admin master - D:ProjectWcrksw&lb admin.g|it现在已经把远程的GIT仓库克隆到本地，接下来需要将仓库检出为项目uhh monitofpvwviwy V VVjwTTVT4 3占 To BrifKhf尙W4JConvvwU.CtrU.3 ReferenCk-d.0 RemoteStashesk_

25、 - WoddfMPush to Upstreem00 Spring M eb.adnFetch from UpstreamVPush BranchQPullRemoteYMerge-Rebase.*Reset 辿Import Projects.Show InAhShiftW 0Collect0Remove Repocitory from ViewXDportProjects. Spring - Spring Tool SuiteFile Edit Source Refactor Navigate Search ProjecS Package Explorer 必 讥 NavigatorLJ

26、2ndquadrant_bdr hh_filedb, 、 v 匕 hh_monitor hh_monitor master| 廊 src O WebContentj hhsignO hh_taskU h h adbJavacc_basicQ hhadbwebadmin匸 package+core9.4ij postgresql-bdrLj SpringMVC_ web odmin八、解决推送冲突 多人协作开发的情况下，往服务器推送更新时难免出现冲突，所以推送之前需 要解决服务器端的最新版本和本地仓库的冲突。Pull操作就是把服务器端的更新拉拢到本地仓库进行合并，解决好合并冲突 后，就可以顺利p

27、ush到服务器分支了。假设，我和乐子在用GIT协作开发hh_monitor项目，目前服务器端的testActio n.java 文件的内容如下：El testAction.java1 package combh;2E public class-testAction 4 public void naimeQ System,?wtprintln(rte5t0；6 )73|乐子做了如下修改3 public dq&s testAttion 1 public void nameO (5 System ,out.printlm( testAAr);6 7 8 I我做了如下修改I 打 tettActianj

28、va 必1 package com.hh;22 public testAction 3 public void nameO System.wpri ntl nicest B B6 7然后乐子先push代码，我commit到本地仓库。Push会出现如下提示：C Pu-sh Results hh_mcni|)ar - originXPusJhed Cd hih manFtor - origimW尿 rnas-tcr f irndstrir revetted - nonrleast-foirwardISI庄1Reposltoh hh12l .42.152J7:/home/hh/db develop/

29、hh monltor.gIIConRgiJire.OK使用pull来合并本地仓库和远程仓库，发现文件出现冲突，此时GIT会自动合并冲突的文件，如下图所示：C Phil ftnult for hi_Hidritar:rtrh RrwltNa rW* -fee 4b4x#-i 1rorn arini - rii#-arsg up bs diaria.QK_ pd亡 Itelukftwuh CoScTgMprgH! npuf-rliwclte bb zzp n3(He-12 ： l INH 为舸7侗*4：埠：”I package co Merge Tool接下来就是熟悉的对比界面3|严叨岬 讪 mt#屛m些 * ”材汀啊山戶聊存肌ar沏科呻* 4 k*馳他血如t* Lib. Sdn:.M IkM AA ?-CHHftdf* wH.hh.列bbt dwi4 PM耳祁 Id rwiv jiDublveiM： iMWti-1 * pubk M