Yaya ake da aukaci da canje-canjen a cikin Git?

Question

Accepted Answer

Git yana ba da hanyoyi da yawa don **cire canje-canjen** dangane da halin da akwai — kawar da canje-canjen da ba a sauye ba, tubare, gyara commit na ƙarshe, cire commit, ko sake maimaita. Sanin kayan aiki daidai don kowane halin yana da mahimmanci, wata hanyar aiki mai amfani a zahiri. ## Cire canje-canjen da ba a sauye ba (gida na aiki) ```bash git restore # discard unstaged changes to a file (revert to last commit) git checkout -- # older equivalent git restore . # discard ALL unstaged changes (careful!) git clean -fd # remove untracked files/directories ``` ## Tubare (ajiye canje-canjen, kawai tubare) ```bash git restore --staged # unstage a file (changes stay in working dir) git reset # older equivalent ``` ## Gyara ko canza commit na ƙarshe ```bash git commit --amend -m "New message" # change the last commit's message git commit --amend # add staged changes to the last commit # ⚠️ amend REWRITES the commit — don't amend commits already pushed/shared ``` ## Cire canje-canjen da aka sauye ```text TWO main approaches: REVERT → creates a NEW commit that undoes a previous commit (SAFE for shared history) git revert → history preserved; the undo is itself a commit RESET → moves the branch pointer BACK (rewrites history — for LOCAL commits only) git reset --soft HEAD~1 → undo commit, KEEP changes staged git reset --mixed HEAD~1 → undo commit, keep changes unstaged (default) git reset --hard HEAD~1 → undo commit AND DISCARD changes (⚠️ destructive!) ``` ## revert da reset (zaɓin mahimmanci) ```text REVERT → safe for PUBLIC/shared commits (adds a new undoing commit; doesn't rewrite history) RESET → rewrites history (only for LOCAL, unpushed commits; never on shared branches) → Rule: use REVERT to undo commits others may have; RESET only for local cleanup. ``` ## Yaya ake ji dadin shi Sanin yaya ake cire canje-canjen a cikin Git yana da mahimmanci, wata hanyar aiki da ake buƙata kuwan-kuwan, saboda kuskure da bukatar cire aiki suna rashin kariya a cikin haɓawa, kuma Git yana ba da hanyoyi masu ƙarfi (amma na takaice lamari) don dawo. Ganowa da **kayan aiki daidai don kowane halin** shine gida ga ƙwara: kawar da **canje-canjen da ba a sauye ba** (`git restore` don mayar da aiki-gida na gyare-gyare, `git clean` don fayiloli da ba a gani ba), **tubare** (`git restore --staged` don ajiye canje-canjen amma tubare su), **canza** commit na ƙarshe (canza saƙon sa ko kari masa — tare da alƙalami mai mahimmanci na rashin canza commits da aka aika saboda yana sake rubutawa tarihaye), da cire **sauye-sauyewan** canje-canjen. Don cire commits, ganowa da **bambanci na mahimmanci tsakanin revert da reset** yana da muhimmanci musamman: **`revert`** yana ƙirƙira sabuwar commit wanda zai cire ta gabata kuma yana **ligali don tarihaye na juna/jama'a** (ba ta sake rubutawa tarihaye, saboda ba za ta dame wasu), yayin da **`reset`** yana motsa masu bambanci na rassa gida kuma **sake rubutawa tarihaye**, yana ba da daidai-daidai ga **gaske na gida, commits da ba a aika ba** (kuma `reset --hard` yana kaici, yana cire canje-canjen). Quakko — yi amfani da `revert` don commits wanda wasu na iya kasowa, yi amfani da `reset` kawai don tsaftacewa na gida — yana da mahimmanci saboda sake rubutawa na tarihaye da ake juna (ta hanyar reset akan aiki-commits) yana haifar da matsaloli mai tsanani ga abokan aiki. Sanin waɗannan zaɓoɓi yana ƙayyade kawar da ɓata aiki (yi amfani da hanyoyi masu kaici cikin rashin tunani) da damowa da jama'a (sake rubutawa tarihaye da juna). Tun yadda cire canje-canjen wata buƙa a gida, rashin kariya, kuma Git yana ba da hanyoyi da yawa na takaice lamari tare da mahimmancin ligali (musamman revert da reset don tarihaye da juna), sanin yaya ake cire canje-canjen a cikin Git — kayan aiki daidai don kowane aljiha da bambanci na mahimmanci na revert-da-reset — yana da mahimmanci, kuwan-kuwan aiki na gida don aiki cikin tayaka da ligali tare da Git, wata ƙwara da ke juyar da damuwa da kuskure zuwa dawo-kai na aiki-rutin sannan guje daga hadarin kaici na sake rubutawa tarihaye da juna.