Question

首先，我的发展很明确，git status很清楚。

当我pull origin develop后跟git status时，它显示在下面

 On branch develop
 Your branch is up-to-date with 'origin/develop'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

   modified:   app/services/thrift/idls/woss/open-api/deviceInfo_service.thrift

 no changes added to commit (use "git add" and/or "git commit -a")

我想签出这个文件，所以我使用这些命令

  git add .
  git checkout -- .
  git stash save --keep-index
  git checkout-index -a -f
  git config --global core.autocrlf false/true/input
  git config --global core.filemode false

但它们都不起作用。

git diff如下所示，

diff --git a/app/services/thrift/idls/woss/open-api/deviceInfo_service.thrift b/app/services/thrift/idls/woss/open-api/deviceInfo
index 7040bf3..062bec8 100644
--- a/app/services/thrift/idls/woss/open-api/deviceInfo_service.thrift
+++ b/app/services/thrift/idls/woss/open-api/deviceInfo_service.thrift
@@ -1,5 +1,5 @@
-namespace rb thrifts.result
+namespace rb ThriftService

 struct QueryDeviceInfo{
@@ -25,7 +25,7 @@ struct DeviceInfo{

 struct Result{
-    1:i32 stat_code,
+    1:i32 statCode,

    2:string errMsg;

任何帮助将不胜感激！

无法摆脱不需要的文件更改

0 个答案: