Dunia 3: Alam Selari

Asas rebase

Anda akan belajar: alihkan branch anda ke atas main yang terkini.

Teks BM belum disemak oleh penutur asli.

Masalahnya

~/diary $ git log --oneline --graph --all* 01bb13d (main) Make heading teal| * 203a91f (HEAD -> about) Say what I like| * a20da6c Add about page|/  * 270a76e Add style* a8feb63 Add day 1 page* 6d3a9b1 Add README

main dah bergerak semasa anda bina about. Anda nak kerja anda di atas main yang terkini. Tanpa merge commit.

Tengok

git rebase main main semula commit anda di atas main, satu demi satu. Macam alihkan kerja anda ke hujung barisan. Itulah (asas semula).

Cuba

Anda di about. Rebase ke atas main.

Petunjuk

Taip git rebase main, kemudian tekan Enter.

Tengok

~/diary $ git log --oneline -n 2203a91f (HEAD -> about) Say what I likea20da6c Add about page~/diary $ git rebase mainSuccessfully rebased and updated refs/heads/about.~/diary $ git log --oneline -n 263ec942 (HEAD -> about) Say what I like0e8659c Add about page

Tengok id itu. Mesej sama, hash baru! Rebase buat salinan baru commit anda.

Teka

about kini betul-betul di atas main. Anda merge about ke main. Apa jadi?

Cuba

Bawa about masuk ke main. Perhatikan fast-forward!

Anda berjaya!

Kini anda boleh rebase branch ke atas main yang terkini.

Nak tahu lebih (pilihan)

Rebase pun boleh berhenti kerana konflik. Baiki fail itu dan git add. Kemudian jalankan git rebase --continue. Ubah fikiran? git rebase --abort kembalikan semuanya. Penanda bawah menamakan commit yang sedang dimain semula.

~/diary $ git rebase mainAuto-merging index.htmlCONFLICT (content): Merge conflict in index.htmlerror: could not apply 0c66136... Add cake dayhint: Resolve all conflicts manually, mark them as resolved withhint: "git add/rm <conflicted_files>", then run "git rebase --continue".hint: You can instead skip this commit: run "git rebase --skip".hint: To abort and get back to the state before "git rebase", run "git rebase --abort".hint: Disable this message with "git config set advice.mergeConflict false"Could not apply 0c66136... # Add cake day~/diary $ git statusinteractive rebase in progress; onto 013a957Last command done (1 command done):   pick 0c66136 # Add cake dayNo commands remaining.You are currently rebasing branch 'cake' on '013a957'.  (fix conflicts and then run "git rebase --continue")  (use "git rebase --skip" to skip this patch)  (use "git rebase --abort" to check out the original branch)Unmerged paths:  (use "git restore --staged <file>..." to unstage)  (use "git add <file>..." to mark resolution)        both modified:   index.htmlno changes added to commit (use "git add" and/or "git commit -a")