Conflict resolution with Meldmerge (Git, Github)

Navigation
1

Thetooldoesnotallowmetouploadchangesfromthemiddlefile,thesearethenewchangesthatIneedtocommit,butitisnotgoing,itispreciselythischangethat"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 from the branch that I created for master $ git checkout MinhaBranch

$ git merge master

I have also tried the inverse of master for minhaBranch , and the same conflict continues.

    
asked by anonymous 31.08.2014 / 16:52

1 answer

1

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

$ git mergetool

And meld starts with every conflict normally.

To configure mergetool :

git config --global mergetool.meld

    
31.08.2014 / 21:34
JPA with the Java 8 Date API How to put images on the screen?