ecce99470a
Deprecate the old merge script as it no longer correctly chooses the patch branch due to relying on numerical sorting order from git. Git actually provides a lexicographical sorting order. This that 9.0.x will be chosen rather than 10.0.x as it is sorted based the 9 vs 1, rather than 9 vs 10. PR Close #37247
26 lines
683 B
Bash
Executable File
26 lines
683 B
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
# Clippy ascii art copied from https://github.com/gbigwood/Clippo
|
|
echo -e "
|
|
################################################
|
|
/ \ _________________
|
|
| | / \\
|
|
@ @ | It looks like |
|
|
|| || | you are trying |
|
|
|| || <--| to merge a PR. |
|
|
|\_/| \_________________/
|
|
\___/
|
|
|
|
A new merge script is available using `ng-dev`!
|
|
|
|
To merge a pr using the new tooling run:
|
|
|
|
$ yarn -s ng-dev pr merge <pr-number>
|
|
|
|
|
|
This script has been fully deprecated as it no
|
|
longer correctly determines branch targets due
|
|
to how it determines the current version and
|
|
defines patch branches.
|
|
################################################"
|