Suppose I am in the dev branch. I enter the git merge new_change , after that many sections appear in the code according to the type of this:

 <<<<<<< HEAD message_copy = {'filepath': filepath, 'guid': guid} ======= message_copy = {"filepath": filepath, "guid": guid} >>>>>>> new_change

How do I do a merge in such a way that when such problems occur, they are solved in favor of dev ?

    1 answer 1

    If the term "similar problems" refers to any conflicts, then the git merge command has the -Xours and -Xtheirs parameters that allow you to automatically resolve the conflict in favor of "our" or "their" versions, respectively.

    For example: git merge -Xours new_change

    But I strongly do not recommend their use in automatic mode.