tyler.durden/L10n
1
0
Fork 0
mirror of https://github.com/Icinga/L10n.git synced 2025-04-08 17:15:19 +02:00
Code Issues Packages Projects Releases Wiki Activity
73 Commits 1 Branch 4 Tags
Commit Graph

5 Commits

Author SHA1 Message Date
Johannes Meyer
5b52c870e6 bin/autoresolve: Still attempt a merge if the API doesn't know its possible 2020-05-28 10:30:56 +02:00
Johannes Meyer
089bc11526 bin/autoresolve: Include mergeable in the log if it's not CONFLICTING 2020-05-27 14:04:45 +02:00
Johannes Meyer
275ddfdf4b bin/autoresolve: Use ssh 2020-05-27 14:00:18 +02:00
Johannes Meyer
17063d6566 bin/autoresolve: Properly handle aborted/succeeding merges 2020-05-27 08:42:00 +02:00
Johannes Meyer
b039e89450 Add script bin/autoresolve 2020-05-26 15:19:47 +02:00