跳至主要內容
日常 Git 操作合併與變基

合併與變基, 執行前先看清

凡是會拼接或改寫歷史的操作,都值得多看一眼。在 gitā 中,每一項操作都會先開啟一個視窗,明確說明即將發生什麼。

立即體驗

AgentWorking1 agent · 2 subagents
Branchfeature/checkout-v2↑2 not pushed
Pull request#214 Checkout v2: shipping and payment as separate steps#214 open · mira
Checks CIe3b7a10 · 2/3
Preview deployment Ready28 min ago · 2 commentsstorefront-git-feature-checkout-v2.northpier.dev
HistoryAuthorDateSHAStatus
Apply the saved address when the cart reloadsMira Okafor4m agoa91f3c2Not pushed +2
Split the payment step into its own routeMira Okafor9m ago5d20e7bNot pushed
Validate the shipping form on the serverMira Okafor32m agoe3b7a10 #214 Review requestedChecks running Preview ready
Round cart totals per line, not per orderTomás Vega47m ago0b6e2f4 Preview building
Checkout v2 skeleton behind a flagMira Okafor1h ago77c4d9e
Merge pull request #212 from feature/search-filtersJonas Lindqvist2h agoc8d41aaChecks passed Live
Persist filters in the URLPriya Nair3h ago4f1a6b3Checks passed Preview ready
Facet counts from the search indexPriya Nair4h ago9e0c5d7
Filter chips for size and colourPriya Nair5h ago2a7f9c1
Cache CDN images for a dayTomás Vega6h agob14e88dChecks passed Production ready
Merge pull request #209 from fix/webhook-retriesMira Okafor1d ago6c3d0f5Checks passed
Back off webhook retries exponentiallyJonas Lindqvist1d agod7e21b0
Record every webhook attemptJonas Lindqvist1d ago83af4c6
Release 2.4.0Tomás Vega2d agof02b7e9Checks passed Production ready
Lazy-load the product galleryPriya Nair2d ago1e9a3d4Checks passed
Merge pull request #205 from feature/gift-cardsJonas Lindqvist3d agoa5c70beChecks passed
Redeem gift cards at checkoutTomás Vega3d ago3d8b1f2
Gift card balance endpointTomás Vega3d ago70e4a9c
Gift card model and migrationsTomás Vega4d agoc2f5e61
Fix the flaky cart end-to-end testMira Okafor4d ago58b0d3aChecks passed
Upgrade to Next.js 16Jonas Lindqvist5d agoe91c7f8Checks failed
Tune the product page's largest paintPriya Nair5d ago0d4b6a2Checks passed
Merge pull request #198 from feature/wishlistMira Okafor6d ago7b3e9c5Checks passed
Wishlist pageJonas Lindqvist6d ago49a1d0e
Save for later buttonJonas Lindqvist1w agob6f82c3
Order status emailsTomás Vega1w ago2c7e5a9Checks passed
Cache category pagesPriya Nair1w ago9a41c0dChecks passed
Format prices per localeMira Okafor1w ago64d2b8eChecks passed
Cart drawerJonas Lindqvist2w ago31f7a6c
Initial storefrontMira Okafor2w agod08e5b4

Mira Okafor mira@northpier.example

4m ago · feature/checkout-v2

Apply the saved address when the cart reloads

The payment step read the address from the form state, so a reload lost it. Read it from the cart instead.

Written with Claude Code

No pull request, checks or deployments

試試看

  1. 在合併視窗中選擇一個分支。

  2. 在三種合併方式之間切換。

  3. 右鍵按一下歷史紀錄中的提交,查看 揀選 與 還原。

  • 先看確認視窗

    合併、變基、揀選、還原與重置都會先彈出視窗,寫明涉及的分支或提交。在你確認之前,什麼都不會改變。

  • 三種合併方式

    條件允許時快進、始終建立合併提交,或僅允許快進。可在「設定 ▸ Git」中選擇預設方式,一旁還有小動畫示範每種方式的效果。

  • 編輯提交

    「編輯此後的提交」即互動式變基。你可以將每筆提交設為保留、改寫訊息、編輯、壓縮、修正或捨棄,拖曳調整順序,gitā 會在執行前檢查方案。

  • 繼續、略過、中止

    操作進行期間,歷史紀錄上方會顯示目前進度列與未解決衝突的檔案數,並提供繼續、略過與中止按鈕。

  • 衝突編輯器

    發生衝突的檔案會同時展示共同祖先、目前版本與傳入版本,下方是可編輯的結果區。點按按鈕選用其中一方,或手動編輯結果,然後儲存並暫存。

  • 帶計數提示的重置

    重置到某筆提交時可選擇保留已暫存變更、保留工作區檔案或捨棄已追蹤變更。視窗會告訴你將影響多少個檔案,硬重置前還需先勾選確認。

  • 二次校驗

    在真正執行前,gitā 會再次確認儲存庫仍然停留在你剛才查看的那個分支與提交上。

Questions, *answered*

Can I resolve merge conflicts in gitā?
Yes. A conflicted file opens with the base, the current and the incoming version, and an editable result underneath. Take one side with a button or write the result yourself, then Save & Stage.
Does gitā support interactive rebase?
Yes. Edit Commits After This is an interactive rebase: set each commit to pick, reword, edit, squash, fixup or drop, drag them into a new order, and gitā checks the plan before it runs.

繼續探索

全部功能

下載 gitā

免費。支援 macOS 14 或更新版本,相容 Apple silicon 與 Intel。