git merge -X theirs v3


Automatic merge failed; fix conflicts and then commit the result.









 ,






URL записи