Sometimes when I want to push to git hub in my Pycharm, I encounter with this error:
Error rebasing
.idea/workspace.xml: needs update You must edit all merge conflicts and then mark them as resolved using git add
If the file is one of my project files, simply I commit it by right clicking on it and choose git\commit. but since 'workspace.xml' is not showing in my project, how can I commit it? is there any way to do that inside Pycharm? if not how to do it from command line?