u/ewong/rhodecode-enterprise-ce-fork Files · rhodecode/templates/email_templates

git: use force fetch and update for target ref. This solves a case...

git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

marcink -


            r2784:e8c62649

default

Name	Size	Modified	Last Commit	Author
/ rhodecode / templates / email_templates
base.mako	Loading ...
commit_comment.mako	Loading ...
email_test.mako	Loading ...
main.mako	Loading ...
password_reset.mako	Loading ...
password_reset_confirmation.mako	Loading ...
pull_request_comment.mako	Loading ...
pull_request_review.mako	Loading ...
test.mako	Loading ...
user_registration.mako	Loading ...

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages