[Feature Request] for Pull Request, Resolve Conflicts via WEB

go-gitea / gitea

Git with a cup of tea! Painless self-hosted all-in-one software development service, including Git hosting, code review, team collaboration, package registry and CI/CD

https://gitea.com

MIT License

44.91k stars 5.48k forks source link

[Feature Request] for Pull Request, Resolve Conflicts via WEB #9014

Open 6543 opened 4 years ago

6543 commented 4 years ago

this is part of #5158 summary ... and could be an addition of #9013

richmahn commented 7 months ago

@oliverqx Want to team up? I've been meaning to get to this and my developers even asked about it recently and told them I would get to it once my big project that ended last quarter (March 31) was over, and now it is over. Interesting to see there is now a bounty on this.

richmahn commented 7 months ago

/attempt #9014

Options

Cancel my attempt

richmahn commented 7 months ago

Not trying to step on any toes here, but seeing what happens if someone else also does an attempt.

richmahn commented 7 months ago

/attempt #9014

oliverqx commented 7 months ago

you can go ahead, I think i'll be busy for the following couple of weeks

richmahn commented 5 months ago

Back to working on this finally. Just made a move across the country the last few months.

HammyHavoc commented 5 months ago

Back to working on this finally. Just made a move across the country the last few months.

Hope you've settled in well! :- ) Exciting stuff!

HyCore commented 2 weeks ago

hi everyone :D how can i increase the bounty haha, this feature would be dope to manage our conflicts in our gitea soc/siem/soar project.

lunny commented 2 weeks ago

Please visit here https://console.algora.io/org/CommitGo/bounties/community?fund=go-Gitea%2Fgitea%239014