Question

我是git-flow的新手。我正在玩它以感受它。我在Windows 10上运行git 2.6.2。大多数事情似乎工作正常，但我遇到了这个问题：

我创建了两个内容冲突的功能分支。然后我完成了他们两个。当我完成第二次，我自然会遇到冲突，然后我可以解决。但是，那时git flow似乎创建了一个奇怪的文件夹。

> git flow feature start PPLAN-0007_Doubles
    [make change to files]
> git commit -am "PPLAN-0007: overloaded add
    [make more change to files]
> git commit -am "PPLAN-0007: overloaded subtract"
> git flow feature start PPLAN-0008_single
    [make conflicting change to files]
> git commit -am "PPLAN-0008: overloaded add"
    [make more change to files]
> git commit -am "PPLAN-0008: overloaded subtract"
> git flow feature finish PPLAN-0007_Doubles
> git flow feature finish PPLAN-0008_single --showcommands
Branches 'develop' and 'origin/develop' have diverged.
And local branch 'develop' is ahead of 'origin/develop'.
git checkout develop
Already on 'develop'
Your branch is ahead of 'origin/develop' by 3 commits.
  (use "git push" to publish your local commits)
git merge --ff feature/PPLAN-0008_single
Auto-merging Math.cs
CONFLICT (content): Merge conflict in Math.cs
Recorded preimage for 'Math.cs'
Automatic merge failed; fix conflicts and then commit the result.

There were merge conflicts. To resolve the merge conflict manually, use:
    git mergetool
    git commit

You can then complete the finish by running it again:
    git flow feature finish PPLAN-0008_single
> git mergetool
    [fix merge conflict]
> git status
On branch develop
Your branch is ahead of 'origin/develop' by 3 commits.
  (use "git push" to publish your local commits)
All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

Changes to be committed:

        modified:   Math.cs

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        "(cd .git \357\200\276/"

正如您所看到的，我现在有一个奇怪的未跟踪文件。它实际上是一个已创建的文件夹结构。在GitExtensions：

中看起来像这样

https://nodejs.org/en/blog/release/v0.10.36/

它看起来像unix命令会创建的东西。

git flow个命令都没有报告任何错误。实际上，文件似乎是在第二个完成命令之后立即创建的。如果我解决冲突，这并不重要。

发生了什么事？难道我做错了什么？需要配置哪些东西？

我确实有一个似乎是一种解决方法：我可以删除这个奇怪的文件，然后继续git flow feature finish PPLAN-0008_single。

Answer 1

这是git-flow AVH Edition中的一个错误，该版本已在1.9.1版软件中修复。

Chocolatey需要使用此版本进行更新。如果可能，您需要向Chocolatey提交错误报告。

在Windows上使用git flow时出现奇怪的文件夹

1 个答案: