Is it possible to change the "update branch by merge" default to "update branch by rebase" when PR is outdated?

liufeimath · June 19, 2024, 1:35am

I find “update branch by rebase” more natural and convenient to use, especially when these commits leave a record in the PR. It’s also nice to not have the random “Merge branch ‘master’ into …” in the PR’s commit set.

Despite the above, the default choice is “by merge”, and user needs to click extra buttons to select “by rebase”. Is it possible to configure the repo setting to make the “by rebase” the default (for outdated PRs) ?

liufeimath · July 9, 2024, 11:43pm

Bumping up the post. It seems that this forum is not actively maintained.

MAW · September 6, 2024, 4:39pm

I’d love this. Looks like it’s a feature request in their repo, so it’s probably worth upvoting/subscribing there: Option to select preferred branch update strategy · Issue #21182 · go-gitea/gitea · GitHub

liufeimath · September 6, 2024, 10:11pm

Thanks! Do I just “thumb-up” to upvote? Anything else I need to do?

MAW · September 9, 2024, 8:42pm

Just doing a thumbs up is typically enough.

puzzle-it-nu · September 18, 2024, 8:25am

You can adjust the following template:

github.com

go-gitea/gitea/blob/1fede04b83288d8a91304a83b7601699bb5cba04/templates/repo/issue/view_content/update_branch_by_merge.tmpl

{{if and (gt $.Issue.PullRequest.CommitsBehind 0) (not $.Issue.IsClosed) (not $.Issue.PullRequest.IsChecking) (not $.IsPullFilesConflicted) (not $.IsPullRequestBroken)}}
	<div class="divider"></div>
	<div class="item item-section">
		<div class="item-section-left flex-text-inline">
			{{svg "octicon-alert"}}
			{{ctx.Locale.Tr "repo.pulls.outdated_with_base_branch"}}
		</div>
		<div class="item-section-right">
			{{if and $.UpdateAllowed $.UpdateByRebaseAllowed}}
				<div class="tw-inline-block">
					<div class="ui buttons update-button">
						<button class="ui button" data-do="{{$.Link}}/update" data-redirect="{{$.Link}}">
							<span class="button-text">
								{{ctx.Locale.Tr "repo.pulls.update_branch"}}
							</span>
						</button>
						<div class="ui dropdown icon button">
							{{svg "octicon-triangle-down"}}
							<div class="menu">
								<a class="item active selected" data-do="{{$.Link}}/update">{{ctx.Locale.Tr "repo.pulls.update_branch"}}</a>

This file has been truncated. show original