0

I am using SmartGit and when I take a pull(merge and pull), it shows 'merging' on my project folder in repositories window and it is not allowing me to push my change.

Vamsi Ravi
  • 1,196
  • 8
  • 26
Ash
  • 1
  • 1
    Did you already try to commit the Merging state? You might have to resolve conflicts before. Also, please post a screenshot of the Repository view. – mstrap Oct 08 '15 at 16:42

1 Answers1

0

You need to perform a commit to actually perform the merge, so commit the merge result after solving potential conflicts and then you can push

PeCosta
  • 537
  • 4
  • 13