6 commits

Author	SHA1	Message	Date
Yureka	420e6915df	Vous avez des branches divergentes et vous devez spécifier comment les réconcilier	2024-08-08 10:39:00 +02:00
raito	62ccc0282b	fix(ows): per-job runtime directories + proper local refspec ... The local refspec was weird and exploiting a edge case for the nixpkgs jobs where local and from were the same. We are more explicit now, which fixes the sandbox jobs. Signed-off-by: Raito Bezarius <masterancpp@gmail.com>	2024-07-22 15:41:47 +02:00
Yureka	d9809e1e78	gerrit-one-way-sync: disallow auto-merging a staging iteration into master	2024-07-20 15:14:00 +02:00
Yureka	3fa4a25d87	gerrit-one-way-sync: set git user info	2024-07-20 15:14:00 +02:00
Yureka	0ff5eea4ed	gerrit-one-way-sync: merge instead of rebase	2024-07-20 15:14:00 +02:00
raito	80c4757571	gerrit01: add a one-way-sync service ... It's basic and does not handle conflicts which needs to be manually managed. Signed-off-by: Raito Bezarius <masterancpp@gmail.com>	2024-07-19 17:52:44 +02:00