blob: 0bdc94758974f857560d44fa381cff8b9690338c (
plain)
1
2
3
4
5
6
|
ERROR: merge errors were encountered in the following repositories:
baserock:stratum2-hello
baserock:stratum3-hello
Please manually merge the target ref into test/feature in each case, and then merge the system branch.
|