Commit 6b115f1
authored
ci(sync-patches): guard conflict-resolution path against empty commits (#3124)
When all stable->main conflicts are in release-managed files (package.json
versions, etc.) and auto-resolution keeps main's version for every one,
the index becomes clean. The unguarded git commit then exits 1 and the
workflow run shows red despite stable and main being correctly in sync.
Mirror the existing 'no changes to sync' guard from the no-conflict path.1 parent ebf1f82 commit 6b115f1
1 file changed
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
93 | 93 | | |
94 | 94 | | |
95 | 95 | | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
96 | 103 | | |
97 | 104 | | |
98 | 105 | | |
| |||
0 commit comments