Skip to content
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

Suggest to fetch and checkout draft pr branch directly #422

Merged
merged 1 commit into from
May 28, 2024

Conversation

korthout
Copy link
Owner

When the pull request is created in draft mode because of conflicts, the suggestion did not fetch the branch of the opened draft pull request. This meant that the instructions fail when switching, and the commits are cherry-picked on the wrong branch.

Instead, we can fetch the branchname immediately. We no longer need to fetch target either. And while we're at it, we can also simply checkout the branch immediately, so we don't have to switch to it separately.

closes #421

When the pull request is created in draft mode because of conflicts, the
suggestion did not fetch the branch of the opened draft pull request.
This meant that the instructions fail when switching, and the commits
are cherry-picked on the wrong branch.

Instead, we can fetch the branchname immediately. We no longer need to
fetch target either. And while we're at it, we can also simply checkout
the branch immediately, so we don't have to switch to it separately.
@korthout korthout merged commit da478f7 into main May 28, 2024
1 check passed
@korthout korthout deleted the korthout-fix-draft-conflict-suggestions branch May 28, 2024 10:23
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.

Conflict resolution draft_commit_conflicts provides incorrect instructions
1 participant