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.

Sign up for GitHub

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

Jump to bottom

"Update Branch" button on PR #9750

Closed
techknowlogick opened this issue Jan 13, 2020 · 8 comments · Fixed by #9784
Closed

"Update Branch" button on PR #9750

techknowlogick opened this issue Jan 13, 2020 · 8 comments · Fixed by #9784
Labels
type/enhancement An improvement of existing functionality

Comments

@techknowlogick
Copy link
Member

Related #8659

Similar to GitHub when a branch on a PR is out of sync, then an "Updated Branch" button could be used to merge commits from upstream into PR branch (assuming no merge conflicts)
@techknowlogick
Copy link
Member Author

I've just placed a bounty on this issue: https://www.bountysource.com/issues/86919260-update-branch-button-on-pr

@guillep2k guillep2k mentioned this issue Jan 13, 2020
Open
17 tasks
@zeripath
Copy link
Contributor

An extension that would also be needed is to make the author suggestions ignore these merge commits too.

@lunny lunny added the type/enhancement An improvement of existing functionality label Jan 14, 2020
@davidsvantesson
Copy link
Contributor

Maybe all commits which is merge from target shall be ignored as authors, even if not done in UI?

@zeripath
Copy link
Contributor

Exactly!

@6543 6543 mentioned this issue Jan 15, 2020
Merged
13 tasks
@davidsvantesson
Copy link
Contributor

Maybe something to add in the future:
isaacs/github#1419

@6543
Copy link
Member

6543 commented Jan 16, 2020

working on it .. to isaacs/github#1419 I plan to reuse a lot of the normal merge code ... so to extend the function should be easy (but I like get the a simple PR in first, extend afterwards)

@akostin33
Copy link

akostin33 commented May 13, 2020 •
edited
Loading

working on it .. to isaacs/github#1419 I plan to reuse a lot of the normal merge code ... so to extend the function should be easy (but I like get the a simple PR in first, extend afterwards)

Could you please attach the link to issue in gitea project same as isaacs/github#1419 ?

@6543 6543 mentioned this issue May 13, 2020
Closed
@6543
Copy link
Member

6543 commented May 13, 2020

@akostin33 created #11401

and status update: didnt looked into it at the moment ... to many things

@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Assignees
No one assigned
Labels
type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Add "Update Branch" button to Pull Requests 6543-forks/gitea
6 participants
@lunny @davidsvantesson @techknowlogick @zeripath @6543 @akostin33