blob: 75d50c7f735ebb504c22c326565d547a04aa2fba (
plain)
1
2
3
4
5
6
7
8
9
10
|
Merge errors encountered in baserock:stratum2-hello, branch test/stable:
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 in baserock:stratum3-hello, branch test/stable:
Auto-merging conflict.txt
CONFLICT (add/add): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.
|
