Codeberg/Community
54
325
Fork
You've already forked Community
12

Cannot merge my pull request (without another reviewer)? #2012

Closed
opened 2025年07月04日 14:59:35 +02:00 by Frank-AI · 4 comments

Comment

Hi there,

I tried to raise this in the chat but nobody could help me either, so that's why I'm raising it here.

I have this private repo where I'd like to work on branches for new features. Once the development of a feature is completed I'd like to merge it back to main. Hence I created a pull request and thought I just could hit the "merge" button, in a repo where I'm the only member. But this button is not existing and at times I can find a review from another member is missing.

So how to tweak the pull request permission that nobody needs to review it?

I tried to look it up in the repo's settings but nothing comes close to it, honestly I'm a bit lost where to look next. I hope it's not a static configuration of codeberg?

FWIW: this is the PR I'd like to merge Frank-AI/KAN#1

Thanks for any advice

### Comment Hi there, I tried to raise this in the chat but nobody could help me either, so that's why I'm raising it here. I have this private repo where I'd like to work on branches for new features. Once the development of a feature is completed I'd like to merge it back to main. Hence I created a pull request and thought I just could hit the "merge" button, in a repo where I'm the only member. But this button is not existing and at times I can find a review from another member is missing. So how to tweak the pull request permission that nobody needs to review it? I tried to look it up in the repo's settings but nothing comes close to it, honestly I'm a bit lost where to look next. I hope it's not a static configuration of codeberg? FWIW: this is the PR I'd like to merge https://codeberg.org/Frank-AI/KAN/pulls/1 Thanks for any advice

The PR you linked cannot be merged because of merge conflicts.

The PR you linked cannot be merged because of merge conflicts.

sorry for this question, I'm not a codeberg user for a long time. How is it intended how these conflicts should be resolved? Besides the list in the overview I can't see any troublesome parts in the diff comparison

sorry for this question, I'm not a codeberg user for a long time. How is it intended how these conflicts should be resolved? Besides the list in the overview I can't see any troublesome parts in the diff comparison

We have some documentation on how to work with merge conflicts: https://docs.codeberg.org/collaborating/resolve-conflicts/

We have some documentation on how to work with merge conflicts: https://docs.codeberg.org/collaborating/resolve-conflicts/

works now many thanks

works now many thanks
Sign in to join this conversation.
No Branch/Tag specified
main
No results found.
Labels
Clear labels
accessibility

Reduces accessibility and is thus a "bug" for certain user groups on Codeberg.
bug

Something is not working the way it should. Does not concern outages.
bug
infrastructure
Errors evidently caused by infrastructure malfunctions or outages
Codeberg

This issue involves Codeberg's downstream modifications and settings and/or Codeberg's structures.
contributions welcome

Please join the discussion and consider contributing a PR!
docs

No bug, but an improvement to the docs or UI description will help
duplicate

This issue or pull request already exists
enhancement

New feature
infrastructure

Involves changes to the server setups, use `bug/infrastructure` for infrastructure-related user errors.
legal

An issue directly involving legal compliance
licence / ToS

involving questions about the ToS, especially licencing compliance
please chill
we are volunteers
Please consider editing your posts and remember that there is a human on the other side. We get that you are frustrated, but it's harder for us to help you this way.
public relations

Things related to Codeberg's external communication
question

More information is needed
question
user support
This issue contains a clearly stated problem. However, it is not clear whether we have to fix anything on Codeberg's end, but we're helping them fix it and/or find the cause.
s/Forgejo

Related to Forgejo. Please also check Forgejo's issue tracker.
s/Forgejo/migration

Migration related issues in Forgejo
s/Pages

Issues related to the Codeberg Pages feature
s/Weblate

Issue is related to the Weblate instance at https://translate.codeberg.org
s/Woodpecker

Woodpecker CI related issue
security

involves improvements to the sites security
service

Add a new service to the Codeberg ecosystem (instead of implementing into Gitea)
upstream

An open issue or pull request to an upstream repository to fix this issue (partially or completely) exists (i.e. Gitea, Forgejo, etc.)
wontfix

Codeberg's current set of contributors are not planning to spend time on delegating this issue.
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Codeberg/Community#2012
Reference in a new issue
Codeberg/Community
No description provided.
Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?