git-multi-pr
git-multi-pr copied to clipboard
Merge PRs are not really merged with `git-multi-pr merge`
This is the console output I get, ideally I would expect to see on the PR a message with the failure but I only see a 💨 or on my console what prevented the branch from being merged. Everything else works but I don't get the reason why it failed
Merging onto origin/master oldest PR #3611 (84697e5de9): dealing class cache on test env
If this is not the PR what you want to merge, then use `git-multi-pr edit` to reorder your local history, or `git-multi-pr sync` to sync your local queue.
Do you want to merge PR #3611 (84697e5de9)? [yes/NO]:
yes
Ensuring that the PR is open.
> /Users/danielnc/bin/ok.sh update_pull_request "foo/bar" "3612" base="master"
> /Users/danielnc/bin/ok.sh update_pull_request "foo/bar" "3612" state="open"
> /Users/danielnc/bin/ok.sh add_comment "foo/bar" "3611" ":unlock: Merging via `git-multi-pr merge`"
634871761 https://github.com/foo/bar/pull/3611#issuecomment-634871761
> /Users/danielnc/bin/ok.sh add_comment "foo/bar" "3611" ":dash:"
634871771 https://github.com/foo/bar/pull/3611#issuecomment-634871771
Check https://github.com/foo/bar/pull/3611 for the status on your merge.
When it is merged into master, sync your local queue with `git-multi-pr sync`.
Any subsequent PRs will have invalid diffs until you export again with `git-multi-pr export`.
--------------------------------------------------------------------------------------------------
Hey Daniel. This is a known limitation right now. This script uses ok.sh
to interface with github, and at the moment there is no way to merge a pull request using ok.sh
https://github.com/whiteinge/ok.sh
I suggest that you first run git-multi-pr merge
then manually merge the PR on the web interface.
thanks @pingpongboss What would be the best suitable merge strategy from the github UI so we have consistent commit history? Merge, Squash, or rebase?
There's no strong difference. If you had to choose one, go with Squash merging for a cleaner history.
@pingpongboss one last question / suggestion Is there a way to export a single PR? I am asking you this because all of our opened PRs will go thru our CI env, and it's wasting resources if we know certain PRs are not ready to be exported and/or reviewed
It would be ideal if we could export PRs until commit 7bd4f1afd4, because all others are still WIP for example
Yup. If the first word in your commit title is "WIP" then we will stop at that commit during export. I see that this isn't yet documented.
<3 thank you Really enjoying this new workflow and tool.