跳到正文
日常 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。