相关疑难解决方法(0)

我只是想拉.我有更改无视,我的Gemfile和Gemlock文件,我很乐意只是覆盖它们而只是拉.我试着把我的变化藏起来,这对我来说没有用.我该怎么办？

git pull
M   Gemfile
U   Gemfile.lock
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
~/projects/sms/apps2/apps2_admin(apps2)$ git stash save "saved"
Gemfile.lock: needs merge
Gemfile.lock: needs merge
Gemfile.lock: unmerged (4ea16799dba7bfe1db28adecf36dee1af5195c1a)
Gemfile.lock: unmerged (e77439c9f86d1d0eda7ae0787e3e158f90959e68)
Gemfile.lock: unmerged (d690d3860db1aa8e46c1bb2f4de3e52a297b5c26)
fatal: git-write-tree: error building trees
Cannot save the current index state
~/projects/sms/apps2/apps2_admin(apps2)$ git pull
M   Gemfile
U   Gemfile.lock
Pull is …

当我试图从git中取出时,低于错误

Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.

我试图存储更改,但在存储拉不起作用后,请求合并.

如何在不提交/添加现有的情况下提取更改？

我对 git 还是很陌生，并试图弄清楚一切是如何工作的。所以这是我的情况：我一直在我的笔记本电脑上开发一个 Java 项目。推送到 git 存储库并将其拉到另一台机器上。进行了一些更改并推送到存储库。现在我想将我当前的工作拉到我的笔记本电脑上，但它说我不能，因为我有未合并的文件。

Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'

请帮助纠正此问题。谢谢你。

$ git status
on branch master
Your branch is ahead of 'origin/master' by 1 commit.
  (use "git push" to publish your local commits)

You have unmerged paths.
  (fix conflicts and run "git commit")

git pull会偶尔给我发消息如下:

我不明白"U","A"和"D"的标签.有人可以告诉我这是什么意思吗？谢谢.

我刚刚尝试用master另一个分支替换我的服务器上的分支,因为它master被破坏了,我似乎无法解决错误...

我替换它的分支是我的最后一个工作版本.我通过从本地计算机运行以下命令来完成此操作:

git checkout lastWorkingBranch

git merge -s我们的主人

git checkout master

git merge lastWorkingBranch master

git push origin master

然后,在服务器上,我跑了

git pull origin master

但是,这给出了以下输出:

Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.
root@moon:/code/moon# git stash
costing/views.py: needs merge
tools.py: needs merge
costing/views.py: needs merge
tools.py: needs merge
costing/views.py: unmerged (395725168ffab1962655116880b74158de3e1e56) …

我正在使用php-git客户端在我的php脚本中提取分支。每当我从主站进行结帐到测试时，都会收到以下错误。

error: Pull is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

我的文件在bitbucket服务器上。我在bitbucket上添加/修改文件并在那里提交。

我不明白，我没有在本地计算机上做任何事情，但仍然收到此错误。

以下是我的“ git status”输出。

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

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

    modified:   g_1.0.yaml
    new file:   potter_3.4.yaml …