0

I made a merge request to merge my current branch with the master branch but the branches seem to be unable to merge giving me the following notification.

enter image description here

When I click the "Merge locally" button I'm given a series of commands I'm meant to execute but I'm not exactly sure where or how I'm supposed to execute them, are they meant to work in CMD or something else? Just for context I've been doing all my commits and what not through Visual Studio so I'm not fimilar with these commands.

So how am I supposed to follow GitLab's recommended steps for resolving a merge conflict or is there any other way to solve a merge conflict that might be more, "my speed"?

BlueBarren
  • 321
  • 7
  • 24
  • You have to enter those commands in a terminal. For Windows you could get something like https://git-for-windows.github.io/ I'm not a Windows guy though... Visual Studio probably provides a way to merge branches and resolve conflicts too – Jawad Apr 12 '17 at 17:19
  • @Jawad Is CMD not a terminal of sorts, should it work? I also notice your link gives three options any idea which one to use? As far as solving the issue through Visual Studio I haven't found anything and when you search online everyone likes to talk about the commands I don't know how to use. – BlueBarren Apr 12 '17 at 17:29
  • The problem with CMD is that git doesn't come shipped with it so you still have to install it somehow – Jawad Apr 12 '17 at 17:48
  • @Jawad Ah okay, I'll do that. Thanks. – BlueBarren Apr 12 '17 at 18:08

0 Answers0