Simon Westphahl aca9238de9 Allow empty commits with squash merges ... Since squash merges will not create a merge commit Zuul is creating one separately. However, this step can fail when there are no changes to commit. This might for example happen in change-triggered post pipelines. To fix this issue we will restore the behavior used prior to I3379b19d77badbe2a2ec8347ddacc50a2551e505 and allow creating empty merge commits. Change-Id: Ic18cb98f12260338799e963b8dc915c8be1d421b		2024-04-12 20:40:09 +02:00
..
__init__.py	Split the merger into a separate process	2014-02-17 11:47:15 -08:00
client.py	Finish circular dependency refactor	2024-02-09 07:39:40 -08:00
merger.py	Allow empty commits with squash merges	2024-04-12 20:40:09 +02:00
server.py	Finish circular dependency refactor	2024-02-09 07:39:40 -08:00