Skip to content

feat: add merge command #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from

Conversation

armcknight
Copy link

In my personal workflow, I like to rebase as long as I'm working privately, but after getting reviews on PRs, I typically will only merge in upstream changes, to avoid breaking the history of the PR page. So, I would have use for a merge command that cascades merges up a chain. Here's how it looked after a brief test:

❯ glog
*   4b0d7cc (HEAD -> test-chain/3) Merge branch 'test-chain/2' into test-chain/3
|\
| *   0ccb636 (test-chain/2) Merge branch 'test-chain/1' into test-chain/2
| |\
| | * 66941c4 (test-chain/1) test chain edit 1b
* | | cac2d95 test chain edit 3
|/ /
* / fd17589 test chain edit 2
|/
* 2802e5d test chain edit 1
* ad28b75 (fork/fork_master, fork_master) fix alias instructions

@armcknight armcknight marked this pull request as draft March 14, 2025 18:42
@armcknight
Copy link
Author

Added in c346bb4

@armcknight armcknight closed this Apr 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant