Ungalilungisa kanjani Iphutha le-Git Merge

Umqondo wamagatsha uhlotshaniswa nokusebenza kwe-Git. Kukhona igatsha elikhulu elilandelwa amagatsha amaningana aphuma kulo. Uma usuka kwelinye igatsha uye kwelinye noma uma kukhona ukungqubuzana okuhlotshaniswa namafayela egatsha, uzobhekana nomlayezo wephutha, Iphutha le-Git: udinga ukuxazulula inkomba yakho yamanje kuqala . Ngaphandle uma iphutha lixazululiwe, ngeke ukwazi ukushintsha amagatsha ngaphakathi kwe-Git. Asikho isidingo sokwethuka njengoba sizolungisa Iphutha Le-Git Merge namuhla.

I-Git kanye nezici zayo

I-Git yileyo khodi noma isofthiwe ekuvumela ukuthi uqaphe izinguquko kunoma yiliphi iqembu lamafayela. Ngokuvamile isetshenziselwa ukuxhumanisa umsebenzi phakathi kwabahleli bohlelo. Ezinye izici eziphawulekayo ze-Git zihlanganisa:

Isivinini Ukuphepha Kwedathakanye Nobuqotho Usizongezinqubo ezisabalalisiwe nezingezona emugqeni

Ngamagama alula, i-Git iwuhlelo lokuphatha mahhala futhi umthombo ovulekile . Ngosizo lwabanikeli abahlukahlukene, ilandelela amaphrojekthi namafayela njengoba elungiswa ngokuhamba kwesikhathi. Ngaphezu kwalokho, i-Git ikuvumela ukuba buyela esimweni sangaphambilini noma inguqulo, uma kwenzeka kuba namaphutha afana nephutha lokuhlanganisa i-Git.

Ungalanda i-Git ye IWindows , macOS , noma I-Linux amasistimu wekhompyutha.

Okuqukethwe[ fihla ]

• Ulilungisa Kanjani Iphutha Le-Git Merge: Udinga ukuxazulula inkomba yakho yamanje kuqala
• Izinhlobo zezingxabano ze-Git Merge
• Izinyathelo Zokulungiselela:
• Indlela yoku-1: Setha kabusha i-Git Merge
• Indlela yesi-2: Hlanganisa Igatsha Elikhona Noma Lamanje neGatsha Lenhloko
• Indlela yesi-3: Xazulula Ukuhlanganisa Ukungqubuzana
• Indlela yesi-4: Susa Igatsha Elidala Ingxabano
• Uhlu lwamagama: Imiyalo ye-Git evamile
• Uhlu lwamagama: Imigomo ye-Git evamile

Ulilungisa Kanjani Iphutha Le-Git Merge: Udinga ukuxazulula inkomba yakho yamanje kuqala

Iphutha le-Git Current Index likwenqabela ukuthi uye kwelinye igatsha ngenxa yokuhlanganisa ukungqubuzana. Kwesinye isikhathi ukungqubuzana phakathi kwamafayela athile kungabangela ukuthi leli phutha livele, kodwa ngokuvamile livela uma kukhona i ukwehluleka ekuhlanganiseni . Kungenzeka futhi uma usebenzisa ukwenza Donsa noma Hlola imiyalo.

Kunezimbangela ezimbili ezaziwayo zephutha le-Git Current Index:

Ukwehluleka Ukuhlanganisa -Idala ukungqubuzana kokuhlanganisa okudingeka kuxazululwe ukuze kudlulelwe egatsheni elilandelayo. Ukungqubuzana Kumafayela -Uma kukhona amafayela angqubuzanayo egatsheni elithile olisebenzisayo, liyakwenqabela ukuthi uhlole noma uphushe ikhodi.

Izinhlobo zezingxabano ze-Git Merge

Ungabhekana Nephutha Le-Git Merge kulezi zimo ezilandelayo:

Ukuqala Inqubo Yokuhlanganisa:Inqubo yokuhlanganisa ngeke iqale uma kukhona a ushintsho endaweni yesiteji yenkomba yokusebenza kuphrojekthi yamanje. Udinga ukuzinzisa futhi uqedele izenzo ezilindile kuqala. Ngesikhathi sokuhlanganisa:Lapho kukhona p inkinga phakathi kwegatsha elihlanganiswayo kanye negatsha lamanje noma lendawo , inqubo yokuhlanganisa ngeke iqedwe. Kulokhu, i-Git izama ukuxazulula iphutha ngokwayo. Nokho, kwezinye izimo, kungase kudingeke ukuba ulungise okufanayo.

Izinyathelo Zokulungiselela:

1. Ngaphambi kokukhipha imiyalo yokulungisa iphutha lokuhlanganisa i-Git, udinga ukuqinisekisa lokho akekho kwabanye abasebenzisi kokuhlanganisa amafayela finyelela kuwo noma wenze noma yiziphi izinguquko kuwo.

2. Kunconywa ukuthi gcina zonke izinguquko usebenzisa umyalo wokuzibophezela ngaphambi kokuphuma kulelo gatsha noma ngaphambi kokuhlanganisa igatsha lamanje negatsha elikhulu. Sebenzisa imiyalo enikeziwe ukuze wenze:

Qaphela: Sincoma ukuthi ufunde iGlossary ye-Common Git Terms & Commands enikezwe ekugcineni kwalesi sihloko.

Manje, ake siqale ngokuxazulula Iphutha Lenkomba Ye-Git Yamanje noma Iphutha Le-Git Merge.

Indlela yoku-1: Setha kabusha i-Git Merge

Ukubuyisela ukuhlanganisa kuzokusiza ukuthi ufinyelele endaweni yokuqala lapho kungenziwanga ukuhlanganisa. Ngakho-ke, yenza imiyalo enikeziwe kusihleli sekhodi:

1. Uhlobo $ git kabusha -hlanganisa bese ushaya Ngena.

2. Uma lokhu kungasebenzi, sebenzisa umyalo $ git reset -hard HEAD bese ushaya Ngena .

Lokhu kufanele kuzuze ukuhlanganisa kabusha kwe-Git futhi ngaleyo ndlela, kuxazulule iphutha lokuhlanganisa i-Git.

Indlela yesi-2: Hlanganisa Igatsha Elikhona Noma Lamanje neGatsha Lenhloko

Sebenzisa imiyalo elandelayo kusihleli senothi ukuze ushintshele egatsheni lamanje futhi uxazulule Iphutha Le-Git Merge:

1. Uhlobo git ukuphuma bese, cindezela Ngena ukhiye.

2. Uhlobo git merge -s master wethu ukwenza isivumelwano sokuhlanganisa.

Qaphela: Ikhodi elandelayo izonqaba yonke into evela kunhloko/igatsha eliyinhloko futhi igcine idatha evela egatsheni lakho lamanje kuphela.

3. Okulandelayo, khipha git checkout master ukubuyela egatsheni eliyinhloko.

4. Ekugcineni, sebenzisa i-git iyasebenza ukuhlanganisa womabili ama-akhawunti.

Ukulandela izinyathelo zale ndlela kuzohlanganisa womabili amagatsha futhi iphutha lenkomba yamanje ye-Git lizoxazululwa. Uma kungenjalo, zama ukulungisa okulandelayo.

Funda futhi: Bonisa noma Fihla Izingxabano Zokuhlanganisa Ifolda ku Windows 10

Indlela yesi-3: Xazulula Ukuhlanganisa Ukungqubuzana

Thola amafayela anokungqubuzana futhi uxazulule zonke izinkinga. Ukuhlanganisa ukuxazulula izingxabano kwakha ingxenye ebalulekile yokususa iphutha lenkomba yamanje ye-Git.

1. Okokuqala, thola okubangela izinkinga amafayela njenge:

• Thayipha imiyalo elandelayo kusihleli sekhodi: $ vim /path/to/file_with_conflic
• Cindezela Ngena ukhiye wokuyifeza.

2. Manje, hambisa amafayela njenge:

• Uhlobo $ git commit -a -m ‘commit message’
• Hit Ngena .

Ngemva kokuphothulwa kwezinyathelo ezilandelayo, zama uku Hlola wegatsha ubone ukuthi isisebenzile.

Indlela yesi-4: Susa Igatsha Elidala Ingxabano

Susa igatsha elinokungqubuzana okuningi bese uqala kabusha. Uma kungekho okunye okusebenza, kuhlale kuwumqondo omuhle ukususa amafayela angqubuzanayo ukuze ulungise Iphutha le-Git Merge, kanje:

1. Uhlobo git ukuphuma -f kusihleli sekhodi.

2. Shaya Ngena .

Funda futhi: Hlanganisa Ama-akhawunti Amaningi we-Google Drayivu kanye Nezithombe ze-Google

Uhlu lwamagama: Imiyalo ye-Git evamile

Uhlu olulandelayo lwemiyalo ye-Git luzokunikeza umbono ofingqiwe mayelana nendima yalo ekuxazululeni iphutha le-Git Merge: udinga ukuxazulula inkomba yakho yamanje kuqala.

eyodwa. git log -hlanganisa: Lo myalo uzohlinzeka ngohlu lwayo yonke imiyalo ngemuva kwengxabano yokuhlanganisa ohlelweni lwakho.

ezimbili. git diff : Ungakwazi ukubona umehluko phakathi kwezindawo zokugcina noma amafayela ngokusebenzisa umyalo we-git diff.

3. ukuphuma kwe-git: Kungenzeka ukuhlehlisa izinguquko ezenziwe kufayela, futhi ungashintsha namagatsha ngokusebenzisa umyalo we-git checkout.

Ezine. git reset -mixed: Kungenzeka ukuhlehlisa izinguquko kunkomba yokusebenza kanye nezinguquko zendawo yesiteji ngokuyisebenzisa.

5. git merge -abort: Uma ufuna ukubuyela esiteji ngaphambi kokuhlanganisa, ungasebenzisa umyalo we-Git, git merge -abort. Lokhu kuzokusiza futhi ukuthi uphume enqubweni yokuhlanganisa.

6. git reset: Uma ufuna ukusetha kabusha amafayela angqubuzanayo abe esimweni sawo sangempela, ungasebenzisa lo myalo we-git reset. Lo myalo uvame ukusetshenziswa ngesikhathi sokuhlanganisa ukungqubuzana.

Uhlu lwamagama: Imigomo ye-Git evamile

Funda le migomo ukuze ujwayelane nayo ngaphambi kokulungisa Iphutha Le-Git Merge.

eyodwa. Hlola- Lo myalo noma igama lisiza umsebenzisi ekushintsheni amagatsha. Kodwa kufanele uqaphele ukungqubuzana kwamafayela ngenkathi wenza kanjalo.

ezimbili. Landa - Ungalanda futhi udlulise amafayela egatsheni elithile uwayise endaweni yokusebenza lapho ulanda i-Git.

3. Inkomba- Ibizwa ngokuthi i-Working noma isigaba sesiteji se-Git. Amafayela alungisiwe, engeziwe, nasusiwe azogcinwa ngaphakathi kwenkomba kuze kube yilapho usulungele ukuthumela amafayela.

Ezine. Hlanganisa - Ukuhambisa ukuguqulwa kusuka egatsheni elilodwa futhi kufakwe egatsheni elihlukile (ngokwesiko eliyinhloko).

5. IKHANDA - Igodliwe ikhanda (isithenjwa esiqanjiwe) sisetshenziswe ngesikhathi sokuzinikela.

Kunconyiwe:

• Ulilungisa kanjani Iphutha le-Hulu Token 3
• Ulengeza kanjani Ikhasi ku-Google Amadokhumenti
• Ungeza kanjani Uhlu Lokuqukethwe ku-Google Amadokhumenti
• Lungisa Iphutha I-TVAPP-00100 ku-Xfinity Stream

Sithemba ukuthi umhlahlandlela wethu usize futhi ukwazile ukuxazulula inkinga Iphutha le-Git Merge: udinga ukuxazulula inkomba yakho yamanje kuqala . Uma unanoma yimiphi imibuzo, yibeke esigabeni sokuphawula.

U-Elon ungumbhali wezobuchwepheshe e-Cyber ​​S. Ubelokhu ebhala imihlahlandlela yokuthi kwenziwa kanjani iminyaka eyi-6 manje futhi uhlanganise izihloko eziningi. Uthanda ukumboza izihloko ezihlobene ne-Windows, Android, namaqhinga namathiphu akamuva.