Alexander Shafir

创建于 2017年09月26日 15:46

Unfortunately, I do not know how to make the merge tool to re-appear. I hope somebody will chirp in on that. Would love to learn myself. But to get you unstuck ... Option 1: Open a terminal window ...

1. 社区
2. PyCharm
3. Can't checkout because of unmerged files

• 3 票

创建于 2017年09月26日 15:58

Is Python interpreter you are using in the external terminal matches the one set in for your project in PyCharm? Is it possible that one uses virtual environment and the other is not?

1. 社区
2. PyCharm
3. Python PATH (sys.path) different in Python Console, Terminal, external shell

• 0 票

创建于 2017年05月22日 18:48

OK, I found the answer. It is not PyCharm who merges the files but the docker-compose itself. Thanks.

1. 社区
2. PyCharm
3. Docker Compose File

• 0 票