gusijin的博客

问题合并master到分支提示：Your local changes to the following files would be overwritten by merge解决方法git statusOn branch gsj_confirm_arrivalYour branch is up to date with 'origin/gsj_confirm_arrival'.Changes to be committed: (use "git restore --staged &lt

smartGit使用之切换界面视图进入首选项用户界面->选择工作图进入首选项编辑->首选项用户界面->选择工作图重新开启软件，界面如下

git statusOn branch gsj_can_not_vipYour branch is up to date with 'origin/gsj_can_not_vip'.Untracked files: (use "git add <file>..." to include in what will be committed) .idea/ Log/ Temp/ env node.prope