Git添加文件夹并推送
目前,我在远程存储库中有这些文件:Git添加文件夹并推送,git,atlassian-sourcetree,Git,Atlassian Sourcetree,目前,我在远程存储库中有这些文件: README run.bat MyCalories2 <-FOLDER THAT IS EMPTY BUT NEED TO HAVE PROJECT FILES 但事实并非如此!如何将完整的文件夹添加到git ~/Dropbox/AndroidStudioProjects/test/xxx (master|MERGING) $ git push -u origin master Username for 'http://git.yyy.com':
README
run.bat
MyCalories2 <-FOLDER THAT IS EMPTY BUT NEED TO HAVE PROJECT FILES
但事实并非如此!如何将完整的文件夹添加到git
~/Dropbox/AndroidStudioProjects/test/xxx (master|MERGING)
$ git push -u origin master
Username for 'http://git.yyy.com': xxx
Password for 'http://yyy.com':
To http://git.yyy.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'http://yyy.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
这是最新的错误消息。实际URL用“yyy”屏蔽
@Marcus我尝试了所有这些命令
ls -la . MyCalories2
MyCalories2:
total 15
drwxr-xr-x 1 Jalle Administ 4096 Jul 25 21:46 .
drwxr-xr-x 1 Jalle Administ 4096 Jul 25 21:49 ..
-rw-r--r-- 1 Jalle Administ 64 Jul 16 19:59 .gitignore
drwxr-xr-x 3 Jalle Administ 0 Jul 25 14:37 .gradle
drwxr-xr-x 15 Jalle Administ 4096 Jul 25 21:51 .idea
-rw-r--r-- 1 Jalle Administ 870 Jul 16 20:01 MyCalories2.iml
drwxr-xr-x 1 Jalle Administ 4096 Jul 25 21:24 app
drwxr-xr-x 3 Jalle Administ 0 Jul 25 14:37 build
-rw-r--r-- 1 Jalle Administ 452 Jul 24 21:33 build.gradle
drwxr-xr-x 3 Jalle Administ 0 Jul 25 14:37 gradle
-rw-r--r-- 1 Jalle Administ 870 Jul 16 19:59 gradle.properties
-rwxr-xr-x 1 Jalle Administ 5080 Jul 16 19:59 gradlew
-rwxr-xr-x 1 Jalle Administ 2404 Jul 16 19:59 gradlew.bat
-rw-r--r-- 1 Jalle Administ 435 Jul 16 19:59 local.properties
drwxr-xr-x 5 Jalle Administ 0 Jul 25 14:37 parseproj
-rw-r--r-- 1 Jalle Administ 16 Jul 16 19:59 settings.gradle
$ git --version
git version 1.9.4.msysgit.0
$ git pull
U MyCalories2
M run.bat
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 mergetool
Merging:
MyCalories2
Submodule merge conflict for 'MyCalories2':
{local}: deleted
{remote}: submodule commit 4bf1b974662b5b694f985ee93401227262fd3f26
Use (l)ocal or (r)emote, or (a)bort? l
$ git push -u origin master
Username for 'http://yyy.com': yyy
Password for 'http://yyy.com':
Counting objects: 245, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (215/215), done.
efrror: RPC failed; result=22, HTTP code = 4136.00 KiB/s
Watal: The remote end hung up unexpectedly
Writing objects: 100% (243/243), 1.29 MiB | 136.00 KiB/s, done.
Total 243 (delta 99), reused 0 (delta 0)
fatal: The remote end hung up unexpectedly
Everything up-to-date
好的,现在手头的问题和原来完全不同了 从git mergetool的输出可以看出,MyCarries2:
您需要做的是
git clone
repository的新副本,然后将要提交的更改(如果有)从旧副本复制到新副本。然后,请参阅,以获取有关如何在子模块中推送更改的信息。使用类似的操作
git init
然后,如果您正在读取任何文件或文件夹,请使用此命令
git add <file/folder name>
然后像这样推到树枝上
git push
错误消息说,该文件与回购同步,所以拉取和重新设置基址可以工作
git pull
git rebase
添加后是否执行了
git commit
?可能也会列出该命令,因为您仔细列出了运行的其他命令。您实际的问题是您试图添加一个空文件夹。不要认为你问题的原始版本是这样说的。它不是空目录。我为什么要这样做。请从我的帖子中删除此标签。我说的是我需要更新的完整项目。为什么我要担心空文件夹?对不起,我读到了“空文件夹”,并假设你指的是“空文件夹”。我投票将这个问题作为离题题来结束,因为它不清楚且自相矛盾(“空文件夹”后面是该文件夹中大量内容的列表)即使在一个早已离去的OP多次编辑之后,最后一次看到它还是在4年前。我更新了这个问题,那个些命令也帮不上忙。仍然无法将文件夹添加到Repository看起来很奇怪,但您需要提供更多信息。什么是ls-la。MyCalories2和git的版本是什么?
git commit -m "First commit"
git push
git pull
git rebase