Posts by gustavo • 1 point

• 0

  votes

  1

  answer

  85

  views

  Q: Git merge in windows conflicts and the line in the file is not marked

  When trying to perform a git merge on Windows in a file that has been modified on the same line, the message is displayed: warning: Cannot merge binary files: g.txt (HEAD vs. feature3) Auto-merging…

  windows git cmd powershell

  asked 7 years, 7 months ago gustavo 1