FormPush multiple: force-with-lease if rejected

[gerhardol]

Fixes #8548

Proposed changes

• Slightly safer regex to check for current branch
• If push is rejected for other than current, offer a slim-down variant of the error dialog. Currently, this is a subset of the "full" dialog, this could change

Note that the full dialog is displayed if current branch is pushed at the same time as any other branch. This is OK, the pull actions have no effect on the non current branches

Screenshots

Before

none - see #8548

After

Test methodology

Manual

---

✒️ I contribute this code under The Developer Certificate of Origin.

[codecov]

Codecov Report

Merging #8549 into master will decrease coverage by 0.02%.
The diff coverage is 33.33%.

@@            Coverage Diff             @@
##           master    #8549      +/-   ##
==========================================
- Coverage   55.07%   55.04%   -0.03%     
==========================================
  Files         901      901              
  Lines       65043    65048       +5     
  Branches    11707    11721      +14     
==========================================
- Hits        35822    35808      -14     
- Misses      26461    26476      +15     
- Partials     2760     2764       +4     

Flag	Coverage Δ
#production	41.98% <33.33%> (-0.03%)	⬇️
#tests	94.80% <ø> (-0.02%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

[gerhardol]

@msftbot merge in 24 hours

[ghost]

Hello @gerhardol!

Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:

• I won't merge this pull request until after the UTC date Mon, 19 Oct 2020 21:13:47 GMT, which is in 1 day

If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you".