Merging conflicts with Git

Having some problems with the Git workflow in PyCharm. If I do a merge, and there are conflicts but I apply but miss resolving some of those conflicts , how do I get back and change them?

When this happens I seem to be in a state where I can't commit, I can't push or merge, all I can is reset –HARD and try it again. If I jump to the command line, there are no problems doing a commit, or pull or anything

What is the proper way to resolve this within a PyCharm only workflow?

Please sign in to leave a comment.