Find the conflicting files (the ones that are red in the project are the conflicting files) as follows: the following is a standard conflict table
<<<<<<< HEAD new new new new code ======= old old old code >>>>>>> xxxxxxxxxxxxxxxxxxxxxxx
Description * :
<<<<<<< HEAD until (a time) =======The content inside is self-branchingcommitcontent
========= to >>>>>>>Inside is a remote dropdown of the
Just delete the code as needed finish up<<<<<<< ======= >>>>>>Delete them all and the conflict will be resolved.
Addendum: resolving anaconda and pycharm conflicts that make import unusable
Resolve annacode and python conflicts:
I. File->Setting->.
Click Add->
And then it's perfect.
Second, remember to reboot and check that the project created is right-click python package->python file instead of folder->python file
The above is a personal experience, I hope it can give you a reference, and I hope you can support me more. If there is any mistake or something that has not been fully considered, please do not hesitate to give me advice.