GitSCM: detect patch conflicts on apply_patch_git (bug 2030211) #1065 (lando@main)
| Warnings |
|
|---|---|
| Blockers |
|
| Branches | bug2030211/apply-patch-conflict-reporting -> main |
| Repo | lando@main (git) (git://github.com/mozilla-conduit/lando.git) |
| Author | shtrom |
| State | closed |
| Commit Title | GitSCM: detect patch conflicts on apply_patch_git (bug 2030211) |
| Commit Body | * GitSCM: detect patch conflicts on apply_patch_git (bug 2030211) * tests: replace _monkeypatch_scm with identical active_mock fixture * tests: add tests for GitSCM.detect_patch_conflict |
Landings
Successfully landed
Landing requested on , by omehani@mozilla.com.
Landing Job: 34927