Posts by user115802 • 53 points

• 5

  votes

  1

  answer

  103

  views

  Q: Prevent git merge when conflict exists

  When I’m using Github for Desktop, and I pull or push, the App just tells me that a file is in conflict and nothing happens. but when I use gitbash, it automatically starts a merge. I’d like you to…

  git

  asked 6 years, 5 months ago user115802 53