Traceback (most recent call last): File “e:\python\lib\runpy.py”, line 197, in _run_module_as_main return _run_code(code, main_globals, None, File “e:\python\lib\runpy.py”, line 87, in _run_code File “e:\python\lib\site-packages\git_review\cmd.py”, line 1722, in _main check_remote(branch, remote, config[‘scheme’], has_color = check_color_support() ort (status, output) = run_command_status(test_command) File “e:\python\lib\site-packages\git_review\cmd.py”, line 156, in run_cous (out, nothing) = p.communicate(stdin) File “e:\python\lib\subprocess.py”, line 1117, in communicate stdout = self.stdout.read() UnicodeDecodeError: ‘gbk’ codec can’t decode byte 0xaf in position 16: illeyte sequence PS E:\2022\work\tfcloud\www> git review You have unstaged changes. Please commit or stash them first, and then try again.
解决方法: 步骤一: 在subprocess.py文件里面加一个encodeing=‘utf-8’ 步骤二:
持续有冲突的情况下,删除项目根目录下的.git文件夹中的rebase-merge
方法一是参见链接https://blog.csdn.net/myli_binbin/article/details/108152690 方法简洁明了且有效!!!
|