Name | Type | Description | Notes |
---|---|---|---|
msg | str | ||
conflict_resolve | dict(str, str) | use to record the resolution of the conflict, example({"b/a.txt":"left"}) | [optional] |
Name | Type | Description | Notes |
---|---|---|---|
msg | str | ||
conflict_resolve | dict(str, str) | use to record the resolution of the conflict, example({"b/a.txt":"left"}) | [optional] |