Indlela Yokuqhathanisa Amafayela Abili Okusebenzisa I-Linux

Lo mhlahlandlela uzokubonisa ukuthi ungasebenzisa kanjani i-Linux ukuqhathanisa amafayela amabili futhi uphume umehluko wabo esibukweni noma kufayili.

Asikho isidingo sokufaka noma iyiphi isofthiwe ekhethekile ukuze uqhathanise amafayela usebenzisa i-Linux kodwa udinga ukwazi ukuvula iwindi lokugcina .

Njengoba umhlahlandlela oxhunyanisiwe ukhombisa ukuthi kunezindlela eziningi zokuvula iwindi lokugcina usebenzisa i-Linux. Okulula ukucindezela izinkinobho ze-CTRL, ALT no-T ngesikhathi esifanayo.

Ukudala Amafayela Okufanisa

Ukuze ulandele kanye nale nhlahlandlela yakha ifayela elibizwa ngokuthi "file1" bese ufaka umbhalo olandelayo:

Amabhodlela ama-10 aluhlaza emdongeni

Amabhodlela ama-10 aluhlaza emdongeni

Uma ibhodlela elilodwa oluhlaza kufanele liwe ngengozi

Kuyoba khona amabhodlela ama-9 aluhlaza odongeni

Ungakha ifayela ngokulandela le miyalo:

1. Vula ifayela ngokuthayipha umyalo olandelayo: ifayela le-nano1
2. Thayipha umbhalo kumhleli we-nano
3. Cindezela i-CTRL no-O ukuze ugcine ifayela
4. Cindezela i-CTRL no-X ukuze uphume ifayela

Manje dala elinye ifayela elibizwa ngokuthi "file2" bese ufaka umbhalo olandelayo:

Amabhodlela ama-10 aluhlaza emdongeni

Uma ibhodlela elithambile elilodwa kufanele liwe ngengozi

Kuyoba khona amabhodlela ama-9 aluhlaza emdongeni

Ungakha ifayela ngokulandela le miyalo:

1. Vula ifayela ngokuthayipha umyalo olandelayo: ifayela le-nano2
2. Thayipha umbhalo kumhleli we-nano
3. Cindezela i-CTRL no-O ukuze ugcine ifayela
4. Cindezela i-CTRL no-X ukuze uphume ifayela

Ukuqhathanisa kanjani amafayela amabili usebenzisa i-Linux

Umyalo osetshenziswa ngaphakathi kweLinux ukukhombisa umehluko phakathi kwamafayela amabili kuthiwa umyalo ohlukile.

Ifomu elilula le-oda elihlukile kanje:

ifayela yefayela ehlukile2

Uma amafayela efana ngakho-ke ngeke kube khona okukhipha uma usebenzisa lo myalo, noma kunjalo, njengoba kukhona umehluko uzobona okukhiphayo okufana nalokhu okulandelayo:

2,4c2,3

...

> Uma ibhodlela elihlaza okwesibhakabhaka kufanele liwile ngengozi

> Kuzoba khona amabhodlela ama-9 aluhlaza odongeni

Okokuqala, okukhipha kungase kubonakale kudidekile kodwa uma uqonda leli gama linengqondo.

Ukusebenzisa amehlo akho ungabona ukuthi umehluko phakathi kwamafayela amabili unjengoba:

• Ifayela lesibili linemigqa emithathu kuphela kanti ifayela lokuqala linama-4.
• Ifayela lesibili lithi "1 ibhodlela elihlaza" emgqeni wesithathu kanti ifayela lokuqala lithi "ibhodlela elilodwa elihlaza"
• Ifayela lesibili lithi "kukhona" kunokuba "kube khona" ekugcineni

Umkhiqizo ovela kumlayezo okhombisa ukuthi phakathi kwemigqa 2 no-4 yefayela lokuqala kanye nemigqa 2 no-3 kwefayela lesibili kukhona umehluko.

I-ke ibhala imigqa kusuka ku-2 kuya ku-4 kusukela efayeleni yokuqala elandelwa imigqa emibili efayela efayili yesibili.

Indlela Yokubonisa Nje Uma Amafayela Ahlukile

Uma nje ufuna ukwazi uma amafayela ahlukile futhi awunesithakazelo ukuthi yimiphi imigqa ehlukile ungagijima umyalo olandelayo:

diff-q ifayela1 ifayela2

Uma amafayela ehlukile okulandelayo kuzoboniswa:

Ifayela lefayela1 nefayela2 lihlukile

Uma amafayela efana futhi akukho okuboniswayo.

Indlela Yokubonisa Umlayezo Uma Amafayela Efanayo

Uma ugijima umyalo ofuna ukwazi ukuthi usebenze kahle, ngakho ufuna umlayezo uboniswe uma uqhuba umyalo ohlukile kungakhathaliseki ukuthi amafayela ahlukile noma ahlukile

Ukuze ufeze le mfuneko usebenzisa umyalo ohlukile, ungasebenzisa umyalo olandelayo :.

i-diff -s ifayela1 ifayela2

Manje uma amafayela efana nawe uzothola umlayezo olandelayo:

Ifayela lamafayela1 nefayela2 zifana

Indlela Yokukhiqiza Ukuhlukana Ngecala Ngecala

Uma kunemifikiswano eningi ngakho-ke kungaba ngokushesha ukudideka ngokuthi yiziphi ngempela umehluko phakathi kwamafayela amabili.

Ungashintsha umkhiqizo womyalo ohlukile ukuze imiphumela iboniswe eceleni. Ukuze wenze lokhu sebenzisa umyalo olandelayo:

ihluke -y file1 ifayela2

Okukhiphayo kwefayela kusebenzisa i- ^ uphawu lokubonisa umehluko phakathi kwemigqa emibili, ukukhombisa umugqa obekwe eceleni.

Ngokuthakazelisayo uma ugijima umyalo usebenzisa amafayela ethu okubonisa ukuthi wonke imigqa izobonisa ehlukile ngaphandle kokugcina kwefayela 2 ezoboniswa njengoba isusiwe.

Ukukhawulela Ubukhulu Bamakholomu

Uma uqhathanisa amafayela amabili eceleni, kungaba nzima ukufunda uma amafayela anamakholomu amaningi ombhalo.

Ukukhawulela inani lamakholomu sebenzisa umyalo olandelayo:

diff --width = ifayela lefayela le-22

Indlela Yokungazinaki Ukuhlukana Kwamacala Lapho Uqhathanisa Amafayela

Uma ufuna ukuqhathanisa amafayela amabili kodwa awunandaba ukuthi icala lezinhlamvu lilinganayo phakathi kwamafayela amabili, ungasebenzisa umyalo olandelayo:

I-diff -i ifayela1 ifayela2

Indlela Yokungazinaki Isikhala Esimhlophe Esilandelayo Ekupheleni Komugqa

Uma uma uqhathanisa amafayela uyaphawula ukuhlukahluka futhi umehluko ubangelwa isikhala esimhlophe ekupheleni kwemigqa ungayishiya lokhu njengoba ubonisa njengezinguquko ngokusebenzisa umyalo olandelayo:

hlukana-ifayela lefayela1

Indlela Yokungazinaki Zonke Izingqikithi Zomhlaba Omhlophe Phakathi kwamafayela amabili

Uma unesithakazelo kuphela embhalweni efayeleni futhi awunandaba ukuthi kunezikhala eziningi kunomunye ongasebenzisa umyalo olandelayo:

ihluke-ifayela lefayela1

Indlela Yokungazinaki Imigqa Engenalutho Uma Uqhathanisa Amafayela Abili

Uma ungakhathazeki ukuthi ifayela elilodwa lingase libe nemigqa engalawuli kuyo futhi ungaqhathanisa amafayela usebenzisa umyalo olandelayo:

I-diff -B file1 file2

Isifingqo

Ungathola ulwazi oluthe xaxa ngokufunda ibhukwana lomyalo ohlukile.

umuntu uhlukile

Umyalo ohlukile ungasetshenziswa ngendlela elula kakhulu ukukhombisa nje umehluko ophakathi kwamafayela amabili kodwa ungasebenzisa futhi ukwakha ifayela ehlukile njengengxenye yesu lokubamba iqhaza njengoba kuboniswe kulolu mhlahlandlela kumyalo we-Linux patch .

Omunye umyalo ongayisebenzisa ukuqhathanisa amafayela ngumyalo we-cmp njengoba kuboniswa yilo mhlahlandlela . Lokhu kuqhathanisa amafayela byte byte.