feat: add local merge (ez merge --local) and fold (ez fold) commands#4
Open
dezren39 wants to merge 3 commits into
Open
feat: add local merge (ez merge --local) and fold (ez fold) commands#4dezren39 wants to merge 3 commits into
dezren39 wants to merge 3 commits into
Conversation
5f55761 to
acc7453
Compare
acc7453 to
32f3dce
Compare
…nd already-exists handling
This was referenced Apr 13, 2026
Open
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds
ez merge --localfor merging branches without GitHub andez foldfor collapsing branch ranges. Also adds--remoteflag to push/submit, fixes cross-fork PR detection, and handles "already exists" errors gracefully.Changes
Local merge and fold
ez merge --local— merge current branch into parent locally--strategy squash(default),--strategy rebase,--strategy merge--into <branch>— merge into a specific branch instead of parent--force— suppress merge-commit warningez fold <range>— fold a range of branches into oneez fold feat/a..feat/c— squash range, survivor is bottom branch--name— rename surviving branchmerge_squash,merge_no_ff,rename_branch,update_branch_refFork workflow fixes
--remoteflag onez pushandez submit— push to a specific git remote, stored per-branch on first useget_pr_status_in_reponow retries with fork-prefixed head (e.g.dezren39:feat/config) when the bare branch name returns no PR in a cross-fork repogh pr createfails because a PR already exists,eznow parses the PR URL from the error, links it, and continues instead of failingCommits (3)
8d66501feat: add local merge (ez merge --local) and fold (ez fold) commands32f3dcetest: add merge/fold CLI parse tests, merge_squash, rename_branch, update_branch_ref git helper tests1e6facdfeat: add --remote flag to push/submit, fix cross-fork PR detection and already-exists handlingResolves rohoswagger#6
259 tests pass, 0 failures.
Stack (this PR is 5 of 5):