Atom git-plus困难 [英] Atom git-plus difficulties

问题描述

我正在尝试设置原子git-plus软件包，并通过了我认为适当的设置步骤，并且无法将文件推送到我的github帐户。使用git config，我配置了user.email和user.name，并确保它们反映了我在Github的帐户和电子邮件地址。

我收到一条错误消息：

 到https://github.com/etc。 
！[已拒绝] HEAD  - > master（取第一个）
错误：未能将一些裁判推送到https://github.com等
更新被拒绝，因为远程包含您本地没有的工作。这通常是由另一个存储库推向相同的参考文件引起的。您可能需要首先集成远程更改，例如再次推动之前，git拉。 
  

新的回购是刚刚创建的测试。我尝试了一次git pull，然后尝试通过git-plus来推送它。我试图删除本地副本并通过克隆重新创建它。我可以使用终端推送文件。
我对版本控制知之甚少，无法知道下一步该做什么。任何想法？

解决方案

对于那些和我一样困惑的人：发生了什么。

我通过指定名称和分支来指定我的 git pull 消息来解决这个问题。这合并了任何文件导致的问题，然后我从git-plus推送工作正常。

据我了解（并请那些知道他们在说什么这里改正我当我bork它）

git拉应阅读

  git pull origin（这是远程存储库的别名）master（这是你从中取出的分支）
  

我在输入git pull而不理解你需要指定你想要合并的位置。

I'm trying to set up atoms git-plus package and have gone through what I think is appropriate setup steps and can't push files to my github account. Using git config, I've configured user.email and user.name and made sure that they reflect my account and email address in Github

I get an error message:

To https://github.com/etc.
![rejected] HEAD -> master (fetch first)
error: failed to push some refs to https://github.com etc.
Updates were rejected because the remote contains work that you do not have locally. This is usually caused by another repository pushing to the same ref. You may want o first integrate the remote changes e.g. git pull before pushing again.

The new repo is a test one created just now. I have tried a git pull followed by an attempt to push it through git-plus. I've tried to delete the local copy and create it again by cloning. I can push the file using the terminal. I don't know enough about version control to know what to do next. Any thoughts?

解决方案

For anyone out there who was as confused as I was re: what is happening.

I fixed this by specifying my git pull message to the name and branch. This merged whatever file was causing the issue and then my push from git-plus worked fine.

As I understand it (and please those that know what they're talking about here correct me when I bork it up)

the git pull should read

git pull origin (which is the alias of your remote repository) master (which is the branch you're pulling from)

I was typing in git pull and not understanding you need to specify where you are trying to merge.

这篇关于Atom git-plus困难的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！