blob: cfb9949de92668cb1e02a5c546be94f11f91840a (
plain)
1
2
3
4
5
6
7
8
9
10
|
Merge errors encountered merging into test/stable in repo baserock:stratum2-hello:
Auto-merging conflict.txt
CONFLICT (add/add): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.
Merge errors encountered merging into test/stable in repo baserock:stratum3-hello:
Auto-merging conflict.txt
CONFLICT (add/add): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.
|
