Indlela yokuqhathanisa ezimbini Iifayile zeeFayile usebenzisa iLuxux

by UGary Newell

Esi sikhokelo siza kukubonisa indlela yokusebenzisa iLuxu ukuthelekisa iifayile ezimbini kwaye uvelise umehluko wabo kwisikrini okanye kwifayile.

Awudingi ukufakela nayiphi na isofthiwe ekhethekileyo ukuze uqhathanise iifayile usebenzisa i-Linux kodwa kufuneka ufunde indlela yokuvula iwindow .

Njengoko umkhombisi odibeneyo ubonisa ukuba kukho iindlela ezininzi zokuvula iwindi yefayili usebenzisa i-Linux. Elula kakhulu ukucofa iqhosha le CTRL, ALT kunye neT exesha elifanayo.

Ukudala iiFayile ukuthelekisa

Ukuze ulandele kunye nesi sikhokelo kwakha ifayile ebizwa ngokuthi "fayile1" kwaye faka le mibhalo elandelayo:

Iibhotile eziluhlaza ezili-10 zimi eludongeni

Ukuba ibhotile enye eluhlaza kufuneka iwele ngengozi

Kuza kuba neebhotile ezili-9 ezimileyo eludongeni

Unokwenza ifayile ngokulandela le miyalelo:

Vula ifayile ngokuthayipha umyalelo olandelayo: ifayile ye-nano1
Thayipha umbhalo kwi -nano editor
Cinezela i-CTRL kunye no-O ukugcina ifayile
Cinezela i-CTRL kunye no-X ukuphuma kwifayile

Ngoku yakha enye ifayile ebizwa ngokuthi "fayile2" kwaye faka umbhalo olandelayo:

Iibhotile eziluhlaza ezili-10 zimi eludongeni

Ukuba ibhodlela elinesibhakabhaka kufuneka liwele ngengozi

Kuza kuba neebhotile ezi-9 ezimileyo eludongeni

Unokwenza ifayile ngokulandela le miyalelo:

Vula ifayile ngokuthayipha umyalelo olandelayo: ifayile ye-nano2
Thayipha umbhalo kwi -nano editor
Cinezela i-CTRL kunye no-O ukugcina ifayile
Cinezela i-CTRL kunye no-X ukuphuma kwifayile

Ukuthelekisa njani iiFayile ezimbini usebenzisa i-Linux

Umyalelo osetyenziswa ngaphakathi kwiLuxal ukubonisa ukungafani phakathi kweefayile ezimbini kuthiwa umyalelo ohlukile.

Ifomu elula yomyalelo ohlukeneyo ngolu hlobo lulandelayo:

fayile fayile1

Ukuba iifayile ziyafana kwaye akukho mveliso xa usebenzisa lo myalelo, nangona kunjalo, njengoko kukho ukungafani, uya kubona umbane ofanayo olandelayo:

2,4c2,3

...

> Ukuba 1 ibhotile eluhlaza kufuneka iwele ngengozi

> Kukho iibhotile ezi-9 ezimileyo eludongeni

Ekuqaleni, umphumo ungabonakala udideka kodwa xa uqonda isigama esicacileyo.

Ukusebenzisa amehlo akho ungabona ukuba umehluko phakathi kweefayile ezi-2 zilandelayo:

Ifayile yesibini inemigca emithathu kuphela kodwa ifayile yokuqala ine-4.
Ifayile yesibini ithi "1 ibhotile eluhlaza" kumgca wesithathu ngelixa ifayile yokuqala ithi "ibhotile enye eluhlaza"
Ifayile yesibini ithi "kukho" esikhundleni sokuba "kukho" ekugqibeleni

Imveliso evela kumyalelo ohlukeneyo ibonisa ukuba phakathi kwemigca yesi-2 kunye ne-4 yefayile yokuqala kunye nemigca yesi-2 kunye ne-3 yesibini kwifayile kukho ukungafani.

Iludweba imida ukusuka ku-2 ukuya kwe-4 ukusuka kwifayile yokuqala elandelwa yimigca e-2 eyahlukileyo kwifayile yesibini.

Indlela yokubonisa nje ukuba iiFayile zihlukile

Ukuba ufuna nje ukwazi ukuba iifayile ziyahlukileyo kwaye awunomdla kwiiyiphi imigca eyahlukileyo ungawuqhuba umyalelo olandelayo:

diff-q ifayile1 ifayile2

Ukuba iifayile ziyahlukileyo ezi zilandelayo ziza kuboniswa:

Ifayile yefayile1 kunye nefayile2 iyahluka

Ukuba iifayile ziyafana kwaye akukho nto iboniswayo.

Indlela Yokubonisa Umyalezo Ukuba iiFayile zifana

Xa uqhuba umyalelo ofuna ukwazi ukuba sele isebenze ngokuchanekileyo, ngoko ufuna ukuba umyalezo uboniswe xa uqhuba umyalelo ongafaniyo nokuba ingaba iifayile zifana okanye zifani

Ukuze ufeze le mfuneko usebenzisa umyalelo ohlukileyo, ungasebenzisa umyalelo olandelayo :.

fayile-fayile yefayile2

Ngoku ukuba iifayile ziyafana uya kufumana umyalezo olandelayo:

Ifayile yefayile1 kunye nefayile2 zifana

Indlela yokuvelisa uhlangothi oluhlukileyo kwicala

Ukuba kukho ukungafani kangangoko ke kunokukhawuleza ngokudideka ngokubhekiselele kwinto eyahlukileyo ngokwenene phakathi kweefayile ezimbini.

Ungatshintsha umphumo womyalelo ohlukeneyo ukuze iziphumo ziboniswe ngapha nangapha. Ukuze wenze oku kuqhuba umyalelo olandelayo:

fayile-fayile yefayile2

Imveliso yefayili isebenzisa i ... isimboli ukubonisa umahluko phakathi kwemigca emibini, ukubonisa umgca oye wahlanganiswa.

Kuyathakazelisa ukuba uqhuba umyalelo usebenzisa iifayile zethu zokubonakalisa ke zonke iimizila ziza kubonisa ngokuhlukileyo ngaphandle kodidi lokugqibela lwefayili 2 oluya kuboniswa njengoko lususiwe.

Ukukhawulela ububanzi bekholomu

Xa uqhathanisa iifayile ezimbini ecaleni ngapha kunokuba nzima ukufunda ukuba iifayile zinemiqolo emininzi yombhalo.

Ukukhawulela inani lamakholomu sebenzisa umyalelo olandelayo:

diff --width = 5 ifayile yefayile2

Indlela yokuthobela ukuhlukana kwemeko xa uqhathanisa amaFayile

Ukuba ufuna ukuthelekisa iifayile ezimbini kodwa unganandaba nokuba imeko yileta ifanayo phakathi kweefayile ezimbini, ngoko unokusebenzisa umyalelo olandelayo:

fayile-fayile1 ifayile2

Indlela yokuLawula ukuhamba kweMidlalo emhlophe ekupheleni komgca

Ukuba xa uthelekisa iifayile ubona imithwalo yemeko eyahlukileyo kwaye ukungafani kubangelwa indawo emhlophe ekupheleni kwemizila ungayishiya le nto njengokuba ubonakalisa njengenguqu ngokusebenzisa umyalelo olandelayo:

fayile-f fayile1 ifayile2

Indlela yokuLawula zonke iiNkcazo zeNdawo ezimhlophe phakathi kweefayile ezimbini

Ukuba unomdla kuphela kwisicatshulwa kwifayili kwaye unganandaba nokuba kukho iindawo ezininzi kunezinye ungayisebenzisa umyalelo olandelayo:

hlule-fayile yefayile2

Indlela yokuLawula iMida engekhoyo xa Uthelekisa iiFayile ezimbini

Ukuba awukhathaleli ukuba ifayile enye ingaba nemigca engaphezulu ebhaliweyo kuyo kwaye unokuqhathanisa iifayile usebenzisa umyalelo olandelayo:

fayile -B fayile1 ifayile2

Isishwankathelo

Unokufumana ulwazi oluninzi ngokufunda le ncwadana yomyalelo ongafaniyo.

umntu uhlukile

Umyalelo ohlukeneyo unokusetyenziswa kwifom elula kakhulu ukubonisa nje ukungafani phakathi kweefayile ezi-2 kodwa ungayisebenzisa ukudala ifayile ehlukileyo njengenxalenye yesicwangciso sokukhangela njengoko kuboniswe kule khokelo kumyalelo we-Linux patch .

Omnye umyalelo ongawusebenzisa ukuthelekisa iifayile ngumyalelo we-cmp njengoko kuboniswe kwesi sikhokelo . Oku kuqhathanisa iifayile nge byte.