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.

Sign up for GitHub

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

Jump to bottom

Why did I not merge to the master/main? It also shows that the branches have been merged #22116

Closed
coverthesea opened this issue Dec 13, 2022 · 4 comments
Closed

Why did I not merge to the master/main? It also shows that the branches have been merged #22116

coverthesea opened this issue Dec 13, 2022 · 4 comments
Labels
issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail type/proposal The new feature has not been accepted yet but needs to be discussed first.

Comments

@coverthesea
Copy link

Feature Description

Only after I merge to main should it be displayed that I have merged
Now I just merge to the test branch, which also shows that the branch has been merged
Is this a different design?

Screenshots

No response
@coverthesea coverthesea added type/feature Completely new functionality. Can only be merged if feature freeze is not active. type/proposal The new feature has not been accepted yet but needs to be discussed first. labels Dec 13, 2022
@lunny lunny removed the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Dec 14, 2022
@lunny
Copy link
Member

lunny commented Dec 14, 2022

But like Gitea has main, release/** may contains some commits from some branch. We don't know which branches should we stick.

@coverthesea
Copy link
Author

coverthesea commented Dec 14, 2022 •
edited
Loading

I think it is generally the default branch
Similar to gitlab
I use gitlab now. Merged will be displayed only when merging to the main branch
I think it should be the default branch set

@wxiaoguang
Copy link
Contributor

I didn't get the point about why "Merged should only be displayed when merging to the main branch".

What benefits does it bring?

Without some real cases, I also think current Gitea's approach is good enough: merged means that the new branch has been merged into another branch.

@wxiaoguang wxiaoguang added the issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail label May 12, 2023
@yardenshoham yardenshoham mentioned this issue Sep 8, 2023
Merged
@GiteaBot
Copy link
Collaborator

GiteaBot commented Sep 8, 2023

We close issues that need feedback from the author if there were no new comments for a month. 🍵

@GiteaBot GiteaBot closed this as completed Sep 8, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail type/proposal The new feature has not been accepted yet but needs to be discussed first.
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
4 participants
@lunny @wxiaoguang @GiteaBot @coverthesea