gitea
gitea copied to clipboard
go-gitea
[Feature Request] for Pull Request, Resolve Conflicts via WEB
https://stackoverflow.com/a/6283843 this solution prints out the merge wich can be also displaied in our web editor to resolve this ... ?
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
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
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
@maskym @brymut I too may be working on this feature. Have either of you made any progress?
Go on @richmahn, I've lost track of this and won't be able to submit anything anytime soon
@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
@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!
We are investigating if Geany would be a viable alternative for the huge Gitlab installation we have running now, and the only real blocker we are seeing now is the lack of conflict resolving within the webinterface. This was mentioned in #14477 but lost traction and it never reached the 1.16 milestone.
@richmahn do you have any plans on implementing this? I have zero experience in coding for Gitea or Go, so I can't be of any help.
@MrHaroldA Totally forgot I even mentioned I would work on this. Will put it on my todo list and see if I can take a stab at it in the coming week.
@richmahn Still wish I had this feature sometimes for productivity sake 😆 By now, I had to learn git more in detail, can you imagine?
I have a PR that now says 2 files are in conflic with the recieving repo., but i still see now way to resolve this... How in earths name can I now fix this? Local repo says everything is fine. Won't let me delete the PR either.
@ktpx that's off topic ... but: merge target branch locally or rebase and push
PS: conflict detections do not work like merge - as it would be a merge otherwhise ...
@eUgEntOptIc44 Sadly haven't had time to work on it, but have mentioned it to my team how badly it is needed. Hopefully can look at it soon, or if someone else wants to get this done, let me know. Should we do it exactly like Github does it, or have some extra functionality to making merging easier?
@richmahn thank you for your update on this. I'd like to directly support on this by contributing code. Unfortunately my knowledge of go is very limited. However I hope that you or someone else might be able to do so.
@richmahn @eUgEntOptIc44 I am also interested in contributing to this feature that would be extremely helpful for my team's needs as well.
I would also mention that the way Github handles merge conflict would be a great baseline for an initial implementation.
Please let me know if available for collaboration on this much needed feature.
I'm not aware of any draft so I would say go on and it is yours ;) If you need help just ask. for the UI side I would have a look if it can be done in vue ... example: #19650 ...
@jayczech23 I'm still needing this and keep playing around with getting this implemented like Github. Can we collaborate together?
@jayczech23 Are you on the Gitea Discord server? If we could touch base there I would be far more likely to get to work on this and better communication since I do everything with Discord. https://discord.gg/mPWThBne
@richmahn sounds great. I will sign up on the Gitea Discord and send you a message. Thanks!
Would love to get an occasional update on this or even help out. I am on the Gitea Discord as well and tagged you @richmahn
@jayczech23 @Alexander-Zierhut Ok, now I'm more clear on you both wanting to help. Awesome. I won't let this drop now. Would be a cool hack-a-thon. My work pays me to work on Gitea, but usually working on our own fork of it and then I merge in from upstream (Gitea). I have many coworkers who use our copy of Gitea for editing text files (content) rather than code.
A few things we need to figure out is first of all, I often get told when making a PR in Gitea that there is a conflict, due to different lines being edited, I think 2 apart, so the line between them still remains the same. This for some reason makes Gitea think there is a conflict. Yet if I merge master/main into the conflicting branch, it merges with no problem. That's one thing we need to solve....stop Gitea from declaring such a conflict (if it still is happening) as it is confusing.
Next is we need to mark up what a conflict editor UI should look like. Should it be just like Github, or something better?
@jayczech23 @Alexander-Zierhut I have added you to a Github test repo so we can see how Github does it, mock up the Gitea, and implement all the different paths a user might take:
Accept the collaboration and see this PR:
https://github.com/richmahn/test/pull/3
Here's a PR where the file was modified in base branch but deleted in the head branch. Github just says it is too complicated and says to deal with it on your computer. Wonder if there is a way we could deal with it in the UI?
https://github.com/richmahn/test/pull/4