Andrew Supryaga

创建于 2023年07月06日 09:44

I had a conflict with the dev branchI rebase dev to my local branchthen merge my remote branch to local branch then merge dev branch to my local branch. And it helped

1. 社区
2. PyCharm
3. "Couldn't check the working tree for unmerged files because of an error"

• 0 票