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

[6543]

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

[6543]

https://stackoverflow.com/a/6283843
this solution prints out the merge wich can be also displaied in our web editor to resolve this ... ?

[maskym]

I'm new to gitea, but it looks like this button (under GitHub)

has no equivalent under gitea and I must solve PR manually ?
Thanks

[6543]

@UBowt571 until now ... yes :/

[MarcelHillmann]

+1

[maskym]

Is there someone already working on it ?
I think about trying to implement it (I'm a noob and this would be my very first fork) but I don't want to do the same work as someone else did

[guillep2k]

@UBowt571 All contributions are welcome! 😄

[brymut]

I'll try to have a go at this other the next couple of days. Sorry for the delay from when I said I would

[nghtstr]

+1

[richmahn]

@maskym @brymut I too may be working on this feature. Have either of you made any progress?

[brymut]

Go on @richmahn, I've lost track of this and won't be able to submit anything anytime soon

[maskym]

@richmahn Ho, go ahead, I surrendered (normal as a French guy lol) and switched to self-hosted gitlab instead
I only managed to display a button but as I never worked in Go lang, the project was too big for me

[richmahn]

@maskym Haha. Loved the French joke. I've been working on Gitea and with Go since 2016, even the one who added the original web interface for editing files, so I should be able to do it. Thanks for the update!