Block a user
t: add manual merge test and improve robustness
mergemodes
As discussed in https://github.com/openSUSE/osc/pull/2050 merging using
-X theirscreates merge artifacts. It only updates files that have conflicts. Non-conflicting files can diverge.
I…
t: add manual merge test and improve robustness
We could change the usage of real project names here to something else. So, instead of products/SLFO we could use TestOrg/TestProject and instead of pool maybe PackageOrg.