Posts by intmarinoreturn0 • 21 points

• 1

  votes

  1

  answer

  510

  views

  A: Meldmerge (Git, Github) conflict resolution

  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…

  git github

  answered 10 years, 3 months ago intmarinoreturn0 21

• 1

  votes

  1

  answer

  510

  views

  Q: Meldmerge (Git, Github) conflict resolution

  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…

  git github

  asked 10 years, 3 months ago intmarinoreturn0 21