|
|
|
|
|
|
by kwhkim
116 days ago
|
|
|
As for the merge conflict, you resolve it the same way you would with any other file in git. I think a custom merge driver needs to be developed eventually — for example, automatically picking `type: bug or feature` instead of leaving the raw conflict markers like the following— but that's not implemented yet. <<<<<
type:bug
====
type: feature
>>>>>> |
|
|