Uma ubulokhu usebenzisa i-Git isikhathi esithile, kungenzeka ukuthi uhlangane nomlando ogcwele imisebenzi engenamsebenzi, imiyalezo "ye-WIP", izivivinyo ezisheshayo, noma ngisho nemisebenzi engenalutho eyenzelwe nje ukuqala i-hook noma ipayipi. Ngaleso sikhathi, ubheka i-log bese ucabanga: "Akekho ongakuqonda lokhu"Izindaba ezinhle ukuthi awuwedwa: kuyenzeka kithi sonke, futhi yilokho ukwesekwa okuyikho. git rebase.
Into ethakazelisayo ukuthi, uma isetshenziswa kahle, i-git rebase ikuvumela ukuthi "uhlanze" umlando wokuzibophezelaKwenze kube okuqondile, okungenamsindo, futhi kube lula kakhulu ukukubuyekeza. Ungasusa ama-test commits, uhlanganise amaningana abe munye, uwahlele kabusha, ulungise imiyalezo ye-commist, futhi ususe ngisho nezinguquko ku-remote ngokusunduza okuphoqelelwe. Ake sibheke, ngezibonelo eziqondile, ukuthi ungasebenzisa kanjani i-rebase ukuguqula umlando wakho usuke esiphithiphithini sibe yinto ehlelekile nefundekayo.
Iyini ngempela i-Git Rebase futhi kungani ithinta umlando?
Uma sikhuluma ngokudlula, sikhuluma ngokoqobo ngokuthi shintsha indawo yokuqala kwegatshaI-Git ithatha izibopho ezivela egatsheni lakho bese "iphinda" ngayinye ngayinye kwesinye isisekelo (imvamisa igatsha main noma igatsha elikude elibuyekeziwe). Kunjengokungathi ubuyele emuva esikhathini waqala umsebenzi wakho kusuka kwesinye isibopho, kodwa wagcina izinguquko.
Cabanga ukuthi iphrojekthi yakho inale ndaba egatsheni eliyinhloko: A – B – CUdala igatsha lokusebenza bese wenza izibopho ezimbili: KAOkwamanje, ngokuyinhloko, othile unezela ukuzibophezela okusha FNgaphandle kokusekela kabusha, amagatsha akho angabukeka kanje:
A---B---C---F (main)
A---B---C---D---E (feature)
Uma wenza ukuhlanganiswa kwegatsha lakho lesici okujwayelekile kube okuyinhloko, okutholayo ukuzibophezela okwengeziwe kokuhlanganisa, okuvame ukukhiqiza umlando ophithene ngemigqa eminingana enqamule. Ngokuphinda ubuyisele, ngakolunye uhlangothi, i-Git ithatha i-commits yakho i-D ne-E bese iyisebenzisa kabusha ku-F:
A---B---C---F---D'---E' (feature reescrita)
Labo U-D' no-E' Lezi azifani ncamashi ne-D kanye ne-E: "ziyikhophi" ezinezihlonzi ezintsha (ama-hashe). Yingakho sithi i-rebase. ubhala kabusha umlandoUmphumela uba yilogi eqondile kakhulu, ngaphandle kokuhlanganiswa okuphakathi okunezela umsindo kuphela.

Kungani kufanele ube nomlando ohlanzekile wokuzibophezela
Irekhodi elihlelekile akuyona nje indaba yobuhle. Ingobo ehlanzekile yenza umsebenzi wansuku zonke ube lula kakhulu.Ungabona ngokushesha ukuthi kwenziweni, nini, futhi kungani, ngaphandle kokugxumela emibhalweni yokuhlanganisa engenalutho noma imiyalezo "yokulungisa okusheshayo" engenamongo.
Uma amagatsha ehlanganiswa ngokuhlanganiswa njalo kusuka kokuyinhloko, ugcina unenqwaba yemisebenzi efana nokuthi “Hlanganisa igatsha 'eliyinhloko' libe yisici-x” Abanikezi ulwazi lwangempela mayelana nokushintsha kwekhodiLokhu kwenza imisebenzi ibe nzima njenge:
- Thola isivumelwano lapho kwafakwa khona i-bug kusetshenziswa amathuluzi okuqhathanisa amafayelangoba umlando ugcwele ukuhlanganiswa okungafanele.
- Buyekeza izicelo zokudonsangoba kufanele ugxume phakathi kwezibopho ezingafuneki ukuze ubone ukuthi yini eshintshile ngempela.
- Ukuqonda ukuvela kwesiciikakhulukazi uma ithuthukiswe ngenxa yokuhlolwa okuningi okuncane.
I-Git rebase iyithuluzi elifanele "lokupholisha" wonke lowo msindo ngaphambi kokwabelana ngegatsha nethimba lonke. Kufana nokubhala umlando wakho emshinini wokuwasha.Ugcina izinguquko ezibalulekile, zihlelwe kahle futhi zinemiyalezo ecacile.
Umehluko obalulekile phakathi kokuhlanganiswa kwe-git kanye nokubuyiselwa kwe-git
Ukuze uqonde ngokugcwele ukuthi wenzani uma usebenzisa i-rebase, kufanelekile ukuqhathanisa ukuziphatha kwayo nalokho kwe- ukuhlangana kwe-gitZombili zisebenza ukuhlanganisa izinguquko, kodwa ngezindlela ezahlukene futhi zinemiphumela ebalulekile kurekhodi.
cunt hlanganisaI-Git idala isivumelwano esisha sokuhlanganisa esinabazali ababili: isihloko segatsha lakho kanye nesihloko segatsha ohlangana nalo. Umlando ophumelayo kugcina ngqo ukulandelana kokuqala kwemisebenziKodwa ingagcina igcwele amagatsha ahambisanayo kanye nokuhlanganiswa.
cunt ukuchichimaEsikhundleni sokudala i-merge commit, i-Git ithatha i-commits yakho bese iyisebenzisa ngayinye kudathabheyisi entsha. Lokhu kudala i-merge commit izibopho ezintsha ngama-hashes amashanoma ngabe izinguquko zekhodi ziyafana.
Ngokusebenza:
- Hlanganisa Igcina umlando njengoba nje kwenzeka, nazo zonke izixhumanisi zayo ezihlanganisiwe kanye nokuhlangana kwayo.
- Phinda ukhiphe Kudala umlando oqondile nohlanzekile, njengokungathi konke kwenzeke ngendlela eqondile.
Ukukhetha akukhona ukuthi "omunye ungcono kunomunye" kodwa yisiphi isimo ngasinye esifaneleka kakhulu?Ukuhlanganisa amagatsha asebevele abelwe kanye navaliwe, ukuhlanganisa kuvame ukuphephile. Ukuze kugcinwe amagatsha asebenzayo endawo ehlelekile noma ngaphambi kokuvula isicelo sokudonsa, ukuphinda kufakwe kuyabonakala.

Amacala lapho ukuphinda kukhanye khona: ukuvuselela nokupholisha amagatsha
Kunezimo ezimbili lapho onjiniyela abaningi basebenzisa khona i-rebase nsuku zonke: gcina igatsha lakho elisebenzayo lisesikhathini nge-main y ukuhlanza izibopho ngaphambi kokuzabelana ngazoAke sizibheke kabanzi.
Buyekeza igatsha lakho lesici ngezinguquko zakamuva ezivela ku-main
Usebenza kusici esisha egatsheni lakho, kodwa okwamanje ozakwenu basaqhubeka nokwenza izivumelwano mainUma ufuna ukuhlanganisa izinguquko zakho, enye inketho iwukuthi:
git checkout tu-rama-feature
git merge main
Lokhu kuyasebenza, kodwa kukhiqiza i-merge commit njalo uma uvumelanisa, okugcina kubangele izinkinga. umlando ogcwele ukuhlanganiswa okuphindaphindiweNoma kunjalo, uma wenza:
git checkout tu-rama-feature
git rebase main
I-Git izohambisa izibopho zakho phezulu kwesimo sokugcina se-main, njengokungathi uqale igatsha ngemuva kwalezo zinguquko. Uzothola umlando oqondile, ngaphandle kokuhlanganiswa okuphakathifuthi isibuyekezo sizoba sobala.
Hlanza izibopho zakho ngaphambi kokuvula isicelo sokudonsa
Kuvamile kakhulu ukuthi, ngesikhathi sokuthuthukiswa kwesici, ugcina unemisebenzi efana nokuthi "ukulungiswa kwe-typo", "ukuhlolwa kwepayipi", "izinguquko eziningi zokungena ngemvume", njll. Kulungile ngenkathi usebenza, kodwa Akulona uhlobo lomlando ofuna ukuwubonisa. uma uvula i-PR.
Ukubuyiselwa kabusha okusebenzisanayo kukuvumela ukuhlela kabusha nokuqoqa lezo zibopho kube yinto enengqondo kakhulu. Isibonelo, esikhundleni salokhu:
- WIP: añadir login
- Más cambios login
- Corregir tests login
- Arreglar typo variable
Ungagcina ngokuzibophezela okukodwa, okuchazwe kahle:
- Añadir funcionalidad completa de login de usuario con tests
Lokho "kupholisha" umlando kwenza kube lula kakhulu ngababuyekezi ukuqonda. lokho okunikezwa yisibopho ngasinye futhi kwenza kube lula ukuxazulula izinkinga esikhathini esizayo.
Ukuphinda kusetshenziswe kabusha komlando ukuze kubhalwe kabusha
Inguqulo eyisisekelo ye-rebase imane ihambisa izibopho zakho kwesinye isisekelo. Kodwa igugu lomqhele yilo i-overbase esebenzisana kakhulu, okuvula umhleli onohlu lwezinto ezisanda kwenziwa ukuze ukwazi ukunquma ukuthi uzokwenzenjani ngeyodwa.
Indlela ejwayelekile yokuqala lokhu iwukucacisa ukuthi zingaki izibophezelo ofuna ukuzithinta kusuka ku-HEAD yakho yamanje. Isibonelo:
git rebase -i HEAD~6
Lo myalo utshela uGit: "thatha izivumelwano zokugcina ezi-6 kuleli gatsha bese ungilungiselela i-rebase esebenzisana nami." I-Git izovula umhleli wakho ozenzakalelayo (i-Vim, i-Nano, i-VS Code, njll.) ngento efana nale:
pick 7ed9c6e update version
pick ecb7ef3 empty commit 1
pick a323615 empty commit 2
pick 2c3d41d empty commit 3
pick d53c00f empty commit 4
pick 22dcc79 empty commit 5
# Phinda usebenzise i-549dd76..22dcc79 ku-549dd76 (imiyalo eyi-6)
#
# Imiyalo:
#p, ukukhetha = sebenzisa ukuzibophezela
#r, igama elisha = Sebenzisa ukuzibophezela, kodwa hlela umlayezo
# e, hlela = Sebenzisa i-commit kanye ne-stop ukuze uyishintshe
#s, i-squash = hlanganisa ekuzibophezeleni kwangaphambilini
# f, ukulungiswa = njenge-squash, kodwa ukulahla umlayezo
# x, ukwenza = sebenzisa umyalo wegobolondo
# b, break = yeka ukuphinda ubuyisele lapha
#d, lahla = susa ukuzibophezela
#…
Phawula umniningwane owodwa obalulekile: Ukuhleleka kuleli fayela kuphambene nalokho okubonayo ku-git logKufayela, i-commit yokuqala ebhalwe ohlwini (7ed9c6e) iyona endala kunazo zonke kweziyisithupha, kanti eyokugcina (22dcc79) iyona yakamuva kakhulu. Lokhu kuyisihluthulelo sokugwema ukudideka lapho ususa noma uhlela kabusha i-commit.
Susa ukuhlolwa noma ukwenza okungenalutho emlandweni wendawo
Ake sithi, ukuze uvivinye i-Git hook, ubulokhu wenza izivumelwano ezingenalutho ngenketho –vumela-kungenalutho. Isibonelo:
git commit -m "commit with no changes" --allow-empty
Le nketho ikuvumela ukuthi udale ukuzibophezela noma ngabe akukho zinguquko kumafayela, okuwusizo ekuhlolweni, kodwa Igcwalisa umlando ngezibopho ezingenalo inani langempela.Cabanga ukuthi ilogi yakho ibukeka kanje:
git log --pretty=oneline --abbrev-commit
Futhi uthola:
22dcc79 (HEAD -> main, origin/main, origin/HEAD) empty commit 5
d53c00f empty commit 4
2c3d41d empty commit 3
a323615 empty commit 2
ecb7ef3 empty commit 1
7ed9c6e update version
Kulesi simo, ufuna ukugcina kuphela ukuzibophezela "kwenguqulo yokuvuselela" ewusizo bese ususa zonke ezinye. ukuzibophezela okungenalutho okwakuyizivivinyo nje. Ukuze wenze lokhu, usebenzisa i-interactive rebase ku-commits zokugcina ezi-6:
git rebase -i HEAD~6
Umhleli uqala ngezivumelwano ezi-6. Umgomo wakho ukususa imigqa ehambisana nezivumelwano ezingenalutho. Okusho ukuthi, ushiya into efana nale:
pick 7ed9c6e update version
# Phinda usebenzise i-549dd76..22dcc79 ku-549dd76 (imiyalo eyi-6)
# … amanye amazwana …
Njengoba kuboniswe esigabeni sosizo sefayela uqobo, Uma ususa umugqa, lokho kuzibophezela kuzonyamalala emlandweni. Enguqulweni entsha, ebhalwe kabusha, lapho igcina futhi ivala umhleli, i-Git izophinda ikhiqize kuphela isivumelwano "senguqulo yokubuyekeza" bese ilahla ezinye.
Ukulayisha indaba entsha ku-Origin: ukusebenzisa ukusunduza okuphoqelelwe
Kuze kube manje, zonke izinguquko zokubuyisela emuva zenziwe kukhophi yakho yendawo yokugcina. Uma ufuna lokho kuhlanzwa kubonakale nasendaweni yokugcina ekude (isibonelo, ku umsuka/okuyinhloko), kuzodingeka ubhale kabusha umlando okude ngowomusha.
Lokhu kwenziwa nge ukusunduzwa okuphoqelelweIndlela evamile yokubonisa lokhu ukusebenzisa uphawu "+" phambi kwegama legatsha lapho ucindezela:
git push origin +main
Leso sibonakaliso sokwengeza sitshela uGit ukuthi Unganaki ukwehluka komlando bese ubhala ngaphezulu igatsha elikude ngenguqulo yakho ebhalwe kabusha. Uma uzama nje ukwenza:
git push origin main
I-Git ingakuxwayisa ukuthi umlando wakho wendawo awuveli ngqo kulowo okude (ngoba ubhale kabusha ama-commits nge-rebase) futhi uzokwenqaba i-Push ukuze ugweme ukulahleka kwedatha.
Kubalulekile ukuqonda ukuthi, ngemva kwalokhu kucindezelwa okuphoqelelwe, Izibopho ezisusiwe ngeke zisatholakala kusukela ku-Origin/mainKungenzeka ukuthi zisesezikhundleni zokubhalisa kabusha noma amakhophi endawo avela kwabanye ozakwabo, kodwa ngezinjongo ezisebenzayo usususile umlando okude.
Isexwayiso esingathi sína: ukubhala kabusha amagatsha abiwe akuyona umdlalo
Ukubhala kabusha umlando kuzwakala kuhle ekuhleleni konke, kodwa kunomphumela obalulekile: lapho kudalwa ama-commits amasha ngama-hashes amasha, Uyalahla noma ubani owayesevele esekele umsebenzi wakhe ezintweni ezindala.Yingakho kukhona umthetho wegolide odumile:
Ungaphindi usebenzise amagatsha asevele abelwe futhi asetshenziswa abanye ngenkuthalo.
Empeleni, lokhu kusho ukuthi kuphephile ukusebenzisa i-rebase ku:
- Amagatsha ezici endawo ongakayishicileli noma oyisebenzisayo wena wedwa.
- Izibopho Zakamuva labo obaziyo ukuthi akekho omunye othembele kubo okwamanje.
Futhi kungumqondo omubi kakhulu ukukwenza lokhu mayelana nalokhu:
- igatsha eliyinhloko, intuthuko noma yiliphi igatsha "elisemthethweni" kusukela endaweni yokugcina izinto esebenza njengesisekelo sabantu abaningana.
- Amagatsha omsebenzi ahlanganyelwe lapho kukhona onjiniyela abangaphezu koyedwa abenza izivumelwano.
Uma ubhala kabusha umlando wegatsha elabiwe bese wenza ukusunduza okuphoqelelwe, abanye ozakwabo bazothola ukuthi Amagatsha ayo akhomba ekuzibophezeleni okungasekho kudeKuzodingeka benze imisebenzi ethuthukile kakhulu (njengokuhlela kabusha umlando omusha noma ukusetha kabusha) ukuze balungise inkinga.
Ukusunduza ngenkani: kungcono ngebhande lesihlalo
Ezimweni eziningi, ngemva kokuphinda ukhiphe i-oda kuzodingeka uphoqe ukusunduza. Inketho yakudala yile:
git push --force origin tu-rama
Noma kunjalo, lolu hlobo lubhala ngaphezulu kwanoma yini eku-remote ngaphandle kokubuza. Ukuze ugweme ukubhala ngaphezulu ngephutha umsebenzi wabanye abantu, i-Git inikeza inketho engcono kakhulu: –ukuphoqelela-ngokuqasha.
Uma wenza:
git push --force-with-lease origin tu-rama
I-Git ihlola kuqala ukuthi Isilawuli kude sisesesimeni obucabanga ukuthi siso. Uma wenza ukudonsa noma ukulanda kwakho kokugcina. Uma kuthola ukuthi othile ucindezele izibopho ezintsha kulelo gatsha kusukela ngaleso sikhathi, ukusunduza kuyenqatshwa futhi akuphoqelelwa, ngaleyo ndlela kukuvimbele ekubhaleni kabusha izinguquko zabanye abantu.
Umqondo ukuhlanganisa i-rebase kanye ne-force Push, njalo ngekhanda elipholile: emagatsheni owalawulayo kuphela kanye nokusebenzisa, noma nini lapho kungenzeka, – ukuphoqelela ukuqasha njengesendlalelo esengeziwe sokuphepha.
Okufanele ukwenze uma ukuphinda kusebenze kungahambi kahle: reflog to the rescue
Kwenzeke kithi sonke: uqala i-rebase esebenzisana, ususe noma ushintshe okuthile ngephutha, uxazulule ingxabano ngendlela engafanele, futhi ngokuzumayo Kubonakala sengathi ulahlekelwe umsebenzi wakhoNgaphambi kokuba wethuke, khumbula ukuthi i-Git ine-ace ekhanda layo: i-git reflog.
I-reflog iyirekhodi lendawo lazo zonke izinyakazo ze-HEAD: ukwenza okusha, ukusetha kabusha, ukuphinda kusetshenziswe, ukuhlanganisa… Ngenxa yayo, ungathola ukuthi igatsha lakho belikuphi ngaphambi kokuthi uliphambanise bese ubuyela kulelo phuzu ngokusetha kabusha okunzima.
Ukugeleza okujwayelekile kungaba:
git reflog
Lapho uzobona uhlu lwezinto ezifakiwe ezinokuthile okufana nalokhu:
abc1234 HEAD@{0}: rebase terminado
def5678 HEAD@{1}: checkout: moving from main to main
...
Ukhomba ukuzibophezela obekukhona ngaphambi kokuqala ukuphinda ukhiphe i-rebase (isibonelo, def5678) bese ubuyela kuye nalokhu:
git reset --hard def5678
Ngale ndlela, Ususa ngokuphelele imbondela bese ubuyela esimweni sangaphambilini. Ungaphinda uhoxise ukuphinda kuqhutshekwe (uma uphakathi nenqubo futhi ungakaqedi) ngokumane:
git rebase --abort
Lo myalo ushiya igatsha lakho njengoba lalinjalo ngaphambi nje kokuqala ukuphinda kusetshenziswe kwamanje, okulungele lapho kuvela izingxabano ongazifuni noma ubona ukuthi akusona isikhathi esihle sokuqhubeka.
I-Git pull vs git pull –rebase: umehluko omncane, umthelela omkhulu
Elinye iphuzu elivame ukuphakamisa ukungabaza umehluko phakathi git ukudonsa evamile futhi git donsa --rebaseBobabili bavuselela igatsha lakho lendawo kusuka kude, kodwa bakwenza ngezindlela ezahlukene.
Uma ugijima:
git pull
I-Git ithatha izinyathelo ezimbili: git ukulanda ukuletha izinguquko kusuka kude bese kuba ukuhlangana kwe-git ukuzihlanganisa negatsha lakho lamanje. Lokhu kungadala i-merge commit eyengeziwe uma une-local commits ngaphezulu kwe-remote, okuphinde futhi umlando onokuhlanganiswa okungadingekile.
Noma kunjalo, uma ugijima:
git pull --rebase
UGit uyalanda bese Phindaphinda izibopho zakho zasendaweni ngenguqulo ebuyekeziwe kusilawuli kude.Umphumela ufana nokuthi ukube ubukwenzile git fetch seguido de git rebase origin/mainfuthi igcina umlando ohlanzekile noqondile.
Yingakho amaqembu amaningi elungiselela i-Git ukuthi isebenzise i-rebase ngokuzenzakalelayo lapho yenza ama-pull. Kuyindlela elula yokwenza gwema ukuhlanganiswa okuzenzakalelayo lokho akunikeli okuningi.
Ukususa amafayela noma izithombe emlandweni: umqondo ojwayelekile
Ngezinye izikhathi inkinga akuyona ukuzibophezela okubi, kodwa ifayela okungafanele lifike endaweni yokugcina impahla: isithombe esingalungile, iziqinisekiso ezingalungile, amafayela amakhulu, njll. Isilingo ukuya ku-GitHub bese ubheka isithonjana sikadoti, kodwa uma sibonakala singasebenzi futhi sibonisa imiyalezo efana nokuthi "kumele ube segatsheni", kungenxa yokuthi I-GitHub ayikuvumeli ukuthi ususe umlando onjalo..
Indlela efanele ivame ukuhilela ukusebenzisa ukubhala kabusha umlando kusuka emshinini wakho wendawo (ngokuphinda kusebenze noma amathuluzi afana i-git filter-repo) bese wenza ukusunduza okuphoqelelwe. Ku-GitHub Desktop ungaphatha futhi amagatsha kanye ne-commits, kodwa ukusebenza kwe susa ngokuphelele ifayela kuzo zonke izinto ezivunyelwe Lokhu kuhilela ukubhala kabusha umlando ngendlela efanayo nalokho esikubonayo lapha.
Ngamafuphi, uma ulayisha isithombe esingalungile noma ifayela elibucayi futhi ufuna "linyamalale" emlandweni, ukulisusa nje ekuzibophezeleni kokugcina akwanele: Izivumelwano lapho zethulwa khona zidinga ukubhalwa kabusha. bese ucindezela ukusunduza. Kungumsebenzi obucayi futhi kufanele wenziwe ngokuthula nangokusebenzisana nethimba lakho.
Ukuhamba okusebenzayo kokuzijwayeza ukudlula ngaphandle kokuphula noma yini
Indlela engcono kakhulu yokuba nekhono lokudlula abanye iwukuzijwayeza endaweni elawulwayo, ngaphandle kokwesaba ukuphazamisa umsebenzi womunye umuntu. Ukugeleza okulula kungaba:
- Dala igatsha elisha kusuka ku-main nge git checkout -b my-tests-branch.
- Yenza imisebenzi emincane eminingana (lokhu kungaba izinguquko ezincane noma amafayela okuhlola).
- Lingisa ukuthuthuka okuyinhloko ngokwenza izibopho ezintsha lapho (noma ucele omunye umuntu ukuba akwenze).
- Buyela egatsheni lakho lokuhlola bese usebenzisa i-git rebase main ukuze ubone ukuthi izibopho zakho zihlelwa kanjani kabusha.
- Zama a git rebase -i HEAD~3 ukuhlanganisa, ukuqamba kabusha, noma ukususa noma yiziphi izibopho zakamuva.
Ngalesi sivivinyo uzobona ukuthi kanjani Shintsha umlando ngaphambi nangemvaIndlela i-Git ephendula ngayo ezingxabanweni nokuthi ungabuyela kanjani ezimweni zangaphambilini usebenzisa i-reflog uma kudingeka. Uma uprakthiza kakhulu endaweni yakini, uzoba nokuqiniseka okwengeziwe lapho usebenzisa lawa masu kumagatsha ephrojekthi yangempela.
Ukuqonda kabusha i-Git kukuvumela ukuthi uguqule umlando odidekile, ogcwele imisebenzi engenalutho, ukuhlanganiswa okungadingekile, kanye nemiyalezo engenamsebenzi, ube ukulandelana okucacile nokufundekayo kwezinguquko ezibalulekile. Ngokusebenzisa i-rebase esebenzisana, ukususa imisebenzi yokuhlola, ukuqoqa umsebenzi ohlakazekile, ukubuyekeza amagatsha ngokulandelana, kanye nokusebenzisa amathuluzi afana ne-reflog kanye ne-forced pushs nge-`--force-with-lease`, ungagcina indawo yakho yokugcina isesimweni esinempilo kakhulu futhi sobungcweti, inqobo nje uma ukhumbula ukusebenzisa lawa maqhinga kuphela kumagatsha angaphansi kolawulo lwakho futhi wazise ithimba ngaphambi kokubhala kabusha umlando owabiwe.