Question

我正面临着一个奇怪的错误，我的git bash for windows已经开始了：我随机拥有一些像git rebase这样的命令似乎跳过参数一次或两次需要多次运行实际上做我想要的。例如：

02:56:30 (release/1.21.0) /d/Repositories/Git/X $ git rebase develop
First, rewinding head to replay your work on top of it...
Applying: C1
Applying: C2
Applying: C3
Applying: C4
[1]-  Done                    gitk --all
[2]+  Done                    gitk --all
02:57:15 (release/1.21.0) /d/Repositories/Git/X $ gitk --all &
[1] 18652

此时没有发生变化，发布/ 1.21.0仍然是以前的原因。

02:57:16 (release/1.21.0) /d/Repositories/Git/X $ git rebase develop
First, rewinding head to replay your work on top of it...
Applying: C1
Applying: C2
Applying: C3
Applying: C4
[1]+  Done                    gitk --all
02:57:22 (release/1.21.0) /d/Repositories/Git/X $ git rebase develop
First, rewinding head to replay your work on top of it...
Applying: C1
.git/rebase-apply/patch:10: trailing whitespace.
#if DEBUG
.git/rebase-apply/patch:11: trailing whitespace.
            String errorMessage = "YY";
.git/rebase-apply/patch:12: trailing whitespace.
#else
.git/rebase-apply/patch:13: trailing whitespace.
            String errorMessage = "XX";
.git/rebase-apply/patch:14: trailing whitespace.
#endif
warning: squelched 36 whitespace errors
warning: 41 lines add whitespace errors.
Resolved 'X/Properties/PublishProfiles/Integration.pubxml' using previous resolution.
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M       X/Application/Controllers/A.cs
M       XTests/Application/Controllers/ATests.cs
M       X/App_Start/B.cs
A       X/Properties/PublishProfiles/A.pubxml
Falling back to patching base and 3-way merge...
Auto-merging X/Properties/PublishProfiles/B.pubxml
CONFLICT (content): Merge conflict in X/Properties/PublishProfiles/B.pubxml
Auto-merging X/App_Start/A.cs
Auto-merging XTests/Application/Controllers/ATests.cs
Auto-merging X/Application/Controllers/B.cs
Patch failed at 0001 C1
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

我还需要再做两次git rebase develop所以它实际上会在开发

上进行
我与git rebase --skip有相同的例子：

03:04:51 (release/1.21.0|REBASE 6/8) /d/Repositories/Git/X $ git rebase --skip usage: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>] or: git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>] or: git-rebase --continue | --abort | --skip | --edit-todo Available options are [...] 03:04:56 (release/1.21.0|REBASE 6/8) /d/Repositories/Git/X $ git rebase --skip Applying: C1 Applying: C2 [...]

编辑：我的别名是

08:40:23 (integration) /d/Repositories/Git/X $ alias alias apilog='api_server_log' alias extlog='extranet_log' alias gd='git diff --word-diff' alias gf='git fetch --prune' alias gk='gitk --all &' alias gs='git status' alias gt='git tree -n 15' alias ll='ls -l' alias ls='ls -F --color=auto --show-control-chars' alias lsf='lsfull' alias lsg='lsgit' alias lsp='lspacks' alias reload='source ~/.bashrc' alias vs='start *.sln' alias winenv='rundll32 sysdm.cpl,EditEnvironmentVariables'

并且找不到git-rebase：

08:40:35 (integration) /d/Repositories/Git/X $ which git-rebase which: no git-rebase in ([...])

发生什么事了？我是否以某种方式破坏了我的配置，以及如何进行故障排除？

git rebase随机需要运行两次

0 个答案: