##// END OF EJS 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.

File last commit:

r2757:4b0930b4 merge default
r2784:e8c62649 default
Show More
.release.cfg
33 lines | 403 B | text/x-ini | IniLexer
project: added all source files and assets
r1 [DEFAULT]
done = false
[task:bump_version]
done = true
release: Start preparation for 4.7.1
r1638 [task:rc_tools_pinned]
release: updated pip2nix output for 4.12.2
r2754 done = true
release: Start preparation for 4.7.1
r1638
i18n: Updated message catalog template
r307 [task:fixes_on_stable]
release: updated pip2nix output for 4.12.2
r2754 done = true
i18n: Updated message catalog template
r307
[task:pip2nix_generated]
release: Finish preparation for 4.12.2
r2755 done = true
i18n: Updated message catalog template
r307
[task:changelog_updated]
release: updated pip2nix output for 4.12.2
r2754 done = true
i18n: Updated message catalog template
r307
release: Merge default into stable for release preparation
r306 [task:generate_api_docs]
release: updated pip2nix output for 4.12.1
r2743 done = true
release: Start preparation for 4.12.1
r2742
[release]
release: Finish preparation for 4.12.2
r2755 state = prepared
release: merge back stable branch into default
r2698 version = 4.11.6
release: Merge default into stable for release preparation
r2693
[task:updated_translation]
release: Start preparation for 4.10.1
r2222
release: merge back stable branch into default
r2272 [task:generate_js_routes]
release: Start preparation for 4.9.0
r2020
project: added all source files and assets
r1 [task:updated_trial_license]
[task:generate_oss_licenses]