-1

I committed my local changes and there are no local changes anymore. But I cannot get an update from master branch. Can anyone help me? error that i get

user11111
  • 1
  • You probably have some conflicting code that doesn't show up on the version control tab. You can check the log section of the VC tab. or try git merge --abort to reset the merging, if pending – Prikesh Savla Mar 30 '20 at 14:23

1 Answers1

0

It's a known issue, please see here: https://youtrack.jetbrains.com/issue/IDEA-63156 https://youtrack.jetbrains.com/issue/IDEA-127308

As a workaround, you can resolve the issue via command-line as described here, or add files via right-click on file | Git | Add

Ruslan Kuleshov
  • 1,934
  • 1
  • 7
  • 11