8 Commits

Author	SHA1	Message	Date
Johannes Meyer	1ea749f493	Update references for branch master to refer to main	2022-01-10 12:10:45 +01:00
Johannes Meyer	6e563b6128	bin/autoresolve: Let members resolve their branches	2021-07-06 15:50:07 +02:00
Johannes Meyer	89a7b0517e	bin/autoresolve: Either resolve local HEAD or given pull request	2020-07-13 13:10:48 +02:00
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