fc2df39c33Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
24 lines
438 B
JSON
24 lines
438 B
JSON
{
|
|
"problemMatcher": [
|
|
{
|
|
"owner": "merge-conflict",
|
|
"pattern": [
|
|
{
|
|
"regexp": "^CONFLICT\\s\\(\\S+\\): (Merge conflict in \\S+)$",
|
|
"message": 1
|
|
}
|
|
]
|
|
},
|
|
{
|
|
"owner": "patch-conflict",
|
|
"pattern": [
|
|
{
|
|
"regexp": "^error: (patch failed: (\\S+):(\\d+))$",
|
|
"message": 1,
|
|
"file": 2,
|
|
"line": 3
|
|
}
|
|
]
|
|
}
|
|
]
|
|
}
|