我仍在研究 Git 的基础知识,并使用 GitHub 作为我的在线存储库。所以当我试图自学并弄清楚一切时,我想我可能会因为安装不同版本的 Git Bash、Git GUI、Git Windows、Git Extensions 而发疯,但我主要使用的是 Git Bash。
我一定对“git init”命令发疯了,因为当我执行“git status”时会显示大量文件。我也在跟踪多个回购,但我只想一次只处理一个。最后,我的问题是如何解决这些冲突,并且一次只能通过本地机器上的 Git bash 使用一个 .git?
这是我执行“git status”时当前显示的内容
$ git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 1 different commit(s) each, respectively.
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
# (commit or discard the untracked or modified content in submodules)
#
# modified: ../../../GitHub/GitHelloWorld (new commits)
# modified: ../../../GitHub/StopFoodWaste (new commits, modified content
)
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# ../../../../.RubyMine40/
# ../../../../.android/
# ../../../../.appletviewer
# ../../../../.asadminpass
# ../../../../.bash_history
# ../../../../.gem/
# ../../../../.gitconfig
# ../../../../.gitignore
# ../../../../.kdiff3rc
# ../../../../.m2/
# ../../../../.ssh/
# ../../../../AppData/
# ../../../../Contacts/
# ../../../../Desktop/
# ../../../../DiskScrP.txt
# ../../../AdventureWorks2012_Data.mdf
# ../../../Amazon MP3/
# ../../../Battlefield 3/
# ../../../BinaryTreeADT.class
# ../../../BinaryTreeADT.java
# ../../../CyberLink/
# ../../../DataStrucNotes.docx
# ../../../Dimitrios Arethas.docx
# ../../../Dimitrios_Arethas_resume.rtf
# ../../../Dimitrios_Arethas_resume_doc.docx
# ../../../Expression/
# ../../../Fiddler2/
# ../../../German Reporter.m4v
# ../../../GoogleCodeJam.class
# ../../../GoogleCodeJam.java
# ../../../Greatwide_cover.docx
# ../../../IISExpress/
# ../../../ITCS2175/
# ../../../ITCS2214/
# ../../../ITCS3200 Notes.docx
# ../../../ITIS - Ethics/
# ../../../Music/
# ../../../My Kindle Content/
# ../../../My Shapes/
# ../../../My Web Sites/
# ../../../Notes/
# ../../../ProjectEuler.class
# ../../../ProjectEuler.java
# ../../../SQL Learn/
# ../../../SQL Server Management Studio/
# ../../../SaaS Class/
# ../../../SharpDevelop Projects/
# ../../../Visual Studio 11/
# ../../../Visual Studio 2005/
# ../../../Visual Studio 2008/
# ../../
# ../../../Youcam/
# ../../../dativ_prepositions.docx
# ../../../desktop.ini
# ../../../dimitrios_engagement_checklist.doc
# ../../../dimitrios_trial_schedule.doc
# ../../../eclipse/
# ../../../gitscc.config
# ../../../me.jpg
# ../../../workspace-sts-2.9.1.RELEASE/
# ../../../../Downloads/
# ../../../../Dropbox/
no changes added to commit (use "git add" and/or "git commit -a")