Meldmerge (Git, Github) conflict resolution

Asked

Viewed 510 times

1

SS

The tool does not allow me to upload the middle file changes, these are the new changes I need to commit, but it is not going, it is precisely this change that "he wants" to overwrite with one of the two next, which are outdated.

How to proceed?

This occurred when I was trying to make a merge of branch that I created for master $ git checkout MinhaBranch

$ git merge master

I also tried the reverse, from master to the minhaBranch, and continues the same conflict.

git github

  • I managed to solve it. Before I opened the file with: $ meld NomeDoArquvo and was therefore not allowed to alter the remote and local, so I set up the mergetool and type: $ git mergetool Ready! with each question in the terminal, I would enter and open the meld in the conflict file and get on with it.

1 answer

1


The problem was caused by opening the meld incorrectly, so it did not "have permission" to change the files of local and of remote. After configuring it, I typed:

$ git mergetool

And meld starts in each conflict normally.

To configure the mergetool:

git config --global mergetool.meld

  • 1

    Solved case mark as solved so it gets easier

Browser other questions tagged git github

You are not signed in. Login or sign up in order to post.