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

Pull request selection with unrelated branches #10525

Closed
invertium opened this issue Feb 28, 2020 · 1 comment · Fixed by #11239
Closed

Pull request selection with unrelated branches #10525

invertium opened this issue Feb 28, 2020 · 1 comment · Fixed by #11239

Comments

@invertium
Copy link

invertium commented Feb 28, 2020

Description

In my repository I have 3 branches. One Master branch and two other branches (which don't share a a common history with the master but not each other, lets call them A and B). Now I want to open a PR from branch A to branch B. Unfortunately, since master is the default branch, as soon as I select "pull from" as branch A I get the error message "cannot merge unrelated branches". This is all well and good but now the selection box is gone, and I cannot select branch B (which should work since they have a common history).

Screenshots

image

image

Workaround: Type the branche names into the url directly.

@guillep2k guillep2k added this to the 1.12.0 milestone Feb 28, 2020
@stale
Copy link

stale bot commented Apr 28, 2020

This issue has been automatically marked as stale because it has not had recent activity. I am here to help clear issues left open even if solved or waiting for more insight. This issue will be closed if no further activity occurs during the next 2 weeks. If the issue is still valid just add a comment to keep it alive. Thank you for your contributions.

@stale stale bot added the issue/stale label Apr 28, 2020
zeripath added a commit to zeripath/gitea that referenced this issue Apr 28, 2020
lunny added a commit that referenced this issue May 2, 2020
Fix #10525

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: guillep2k <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
guillep2k added a commit to guillep2k/gitea that referenced this issue May 3, 2020
)

Fix go-gitea#10525

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: guillep2k <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
zeripath pushed a commit that referenced this issue May 4, 2020
ydelafollye pushed a commit to ydelafollye/gitea that referenced this issue Jul 31, 2020
)

Fix go-gitea#10525

Signed-off-by: Andrew Thornton <[email protected]>

Co-authored-by: guillep2k <[email protected]>
Co-authored-by: Lunny Xiao <[email protected]>
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants