Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge conflict resolution, Revert specific commits or a merge request, Cherry-picking changes #5158

Closed
pjebs opened this issue Oct 24, 2018 · 9 comments
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented type/feature Completely new functionality. Can only be merged if feature freeze is not active.

Comments

@pjebs
Copy link

pjebs commented Oct 24, 2018

In the https://docs.gitea.io/en-us/comparison/ page, it says those 3 features are not implemented.

I was wondering whether it was purely a UI factor why they are aren't implemented given that GitLab CE is open-source and contains those features?

@lunny
Copy link
Member

lunny commented Oct 24, 2018

@pjebs Just because currently no people are working on that. I think it's important and should be implemented.

@lafriks lafriks added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Oct 28, 2018
@stale
Copy link

stale bot commented Jan 5, 2019

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 weeks. Thank you for your contributions.

@stale stale bot added the issue/stale label Jan 5, 2019
@stale
Copy link

stale bot commented Feb 23, 2019

This issue has been automatically closed because of inactivity. You can re-open it if needed.

@stale stale bot closed this as completed Feb 23, 2019
@lunny lunny added issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented and removed issue/stale labels Feb 23, 2019
@lafriks lafriks reopened this Feb 23, 2019
@sebastianmacias
Copy link

@lafriks thanks for reopening this

@6543
Copy link
Member

6543 commented Nov 15, 2019

this are multible feature requests ... so I'll split this up to handle this independent of each ... another

@6543
Copy link
Member

6543 commented Nov 15, 2019

and ther revert is in #8448 and #6375

@lunny
Copy link
Member

lunny commented Nov 15, 2019

@6543 Please add a check list to track these issues.

@6543
Copy link
Member

6543 commented Nov 15, 2019

@lunny its @pjebs issue so i can't do that ...

@delvh
Copy link
Member

delvh commented Aug 21, 2022

As I've just noticed this issue (because of #20905), two thirds of the issue are already implemented by now:
image
I'd say the remaining part is already #9014, so this issue can be closed.

@delvh delvh closed this as completed Aug 21, 2022
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Development

No branches or pull requests

6 participants