r/Gitea | Reddlx

Can I resolve PR merge conflicts using only the Gitea API or web UI?

Hi everyone,

When a pull request has merge conflicts, Gitea disables the merge button and shows that the PR cannot be automatically merged. The usual workaround is to pull the branches locally, resolve conflicts with git, and push back.

I don’t want to use git locally. Is there any way to resolve the conflicts and complete the merge using only:

The Gitea web UI, or
The Gitea API

If this isn’t supported today, is there an existing feature request or roadmap item I can follow?

Environment

Gitea version: 1.23.8
Deployment: Docker

Thanks!

reddit.com

u/S4-MI — 1 day ago

▲ 3 r/Gitea

Can you configure LDAPS against onPrem Active Directory in gitea free open source version?

I looked a little bit on the Gitea Page and there are 2 versions one open source and the other one for enterprise. Enterprise for example supports saml while open source does not. However what if you use onPrem Windows Directory as a User Source? Can you freely configure it via LDAPS?

reddit.com

u/luky90 — 3 days ago

▲ 2 r/Gitea

Can a repo's avatar and social media preview use different images?

I have a logo for a project of mine, but I also have a social media preview image that I'd like to use when linking from elsewhere.

i.e. This project has a logo in "toylogo.png", but when I link externally, github automatically shows the contents of "toypreview.png" which has better formatting for news feeds. If anyone has advice for how to replicate this in a stock gitea image, I'd be super grateful. Thanks!

u/Ratstail91 — 14 hours ago