Wakati gani na jinsi gani ya kuandika upya historia ya Git?

Question

Accepted Answer

Git inakuruhusu **kuandika upya historia** — kuboresheana, kufanya rebase, kusikitisha, au kuondoa commits — ili kusafisha commits au kutatua matatizo. Ni nguvu lakini lazima ifanyike kwa makini: kuandika upya historia ya **umeme** husababisha matatizo makubwa, kwa hivyo sheria zinazotokea nayo ni muhimu sana. ## Njia za kuandika upya historia ```text git commit --amend → modify the most recent commit (message or content) git rebase -i → squash, reword, reorder, edit, drop commits (interactive) git rebase → replay commits onto another base (linear history) git reset → move the branch pointer (discard/uncommit) git filter-repo → rewrite MANY commits (remove a file/secret from all history) → All of these change commit HASHES (rewriting = creating new, different commits). ``` ## Sheria ya dhahabu ```text ⚠️ NEVER rewrite history that has been PUSHED/SHARED (that others may have): → rewriting changes commit hashes → your history DIVERGES from collaborators' → they'll have the old commits; pulls create duplicates/conflicts; chaos ensues → forces everyone to painfully reconcile → a serious disruption ✓ Rewrite ONLY local, unpushed commits (cleanup before sharing). ✗ On shared branches → use REVERT (a new undoing commit) instead, which is safe. ``` ## Matumizi ya kisheria ya kuandika upya (ndani) ```text ✓ Clean up messy WIP commits before opening a PR (squash, reword) → clean history ✓ Fix a mistake in the last commit (amend) before pushing ✓ Keep a feature branch linear/up-to-date with main (rebase) before sharing ✓ Remove a SECRET accidentally committed (filter-repo) — though if it was PUSHED, the secret must be ROTATED (it's already exposed; rewriting alone isn't enough) ``` ## Ikiwa lazima kuandika upya historia ya umeme (nadra) ```text → COORDINATE with the whole team (everyone stops, re-syncs) → Force-push carefully: git push --force-with-lease (safer than --force — checks first) → Everyone must reset/re-clone to the rewritten history → Do this only when truly necessary (e.g. purging a leaked secret) and with agreement. ``` ## Kwa nini inakamatia Kuelewa wakati na jinsi ya kuandika upya historia ya Git ni ujuzi muhimu wa kiwango cha juu kwa sababu kuandika upya historia ni **nguvu lakini hatari**, na kuelewa sheria — haswa karibu na historia ya umeme — kukataza matatizo makubwa wakati wa kuwezesha usafishaji wa kisheria. Kujua **njia za kuandika upya** (amend kwa commit ya mwisho, interactive rebase kwa kusikitisha/kuboresheana neno/kupanga upya, rebase kwa historia ya mstari, reset, filter-repo kwa mabadiliko ya kiwango kikubwa) na kwamba wote **hubadilisha hashes ya commit** (kuunda commits mpya) ni msingi. Akina zaidi, kuelewa **sheria ya dhahabu — kamwe usiotaka upya historia ya umeme/iliyosukumwa** — ni muhimu kwa sababu kuandika upya hubadilisha hashes, husababisha historia yako kutenganisha na ya waadiliaji (ambao bado wana commits za zamani), hii inasababisha nakala mbili, mizozo, na kurudia kwa uchumi; kuandika upya historia ya umeme ni marambio makubwa ambayo sheria hii kukataza, na **revert** (undoing commit mpya salama) ikiwa njia sahihi kwa matawi ya umeme badala yake. Kuelewa **matumizi ya kisheria ya ndani** (kusafisha commits za WIP kabla ya PR, kufanya amend makosa kabla ya kusukuma, kufanya rebase ili kubaki mstari kabla ya ugavi — wote kwa commits ya ndani, iliyosukumwa) kubaini wakati kuandika upya ni sahihi na thamani. Nuance muhimu ya usalama: ikiwa **siri ilisukumwa na kusukumwa**, kuandika upya historia ili kuondoa hii si kutosha — siri tayari imefichua na lazima **ibadilishwe** (jambo muhimu la ulimwengu halisi wa usalama). Kujua jinsi ya **kuhandla rewrite nadra muhimu ya historia ya umeme** (urafiki wa timu, `--force-with-lease` badala ya `--force`, kila mtu re-syncing) inareflect hukumu makubwa. Kwa sababu kuandika upya historia ni nguvu lakini husababisha matatizo makubwa wakati kutumika vibaya kwa historia ya umeme, na kwa sababu kuelewa sheria ya dhahabu, matumizi ya kisheria, na mbinu salama ni muhimu kwa kumtumia vizuri, kuelewa wakati na jinsi ya kuandika upya historia ya Git ni ujuzi muhimu wa kiwango cha juu — mada ambapo kuelewa sheria za usalama (haswa kamwe usiotaka upya historia ya umeme) kukataza janga halisi la waadiliaji, inareflect hukumu inayotakiwa kwa wazo la juu wanatumia Git katika timu.