github与mac osx / xcode

Question

所有，

我对Xcode以及它如何管理文件并不熟悉，所以我需要你的帮助。

我创建了一个带有一些库的Xcode项目，它正在编译。 现在我正在尝试将更改推送到现有的GitHub存储库。

我做了什么：

git init
git add origin
git branch --set-upstream-to=origin/master master
Igors-MacBook-Air:dbhandler igorkorot$ git pull
error: The following untracked working tree files would be overwritten by merge:
    dbhandler/Info.plist
    dbhandler/Info.plist.in
    dbhandler/Makefile.in
    dbhandler/UpgradeLog.XML
    dbhandler/_UpgradeReport_Files/UpgradeReport.css
    dbhandler/_UpgradeReport_Files/UpgradeReport.xslt
    dbhandler/_UpgradeReport_Files/UpgradeReport_Minus.gif
    dbhandler/_UpgradeReport_Files/UpgradeReport_Plus.gif
    dbhandler/chart.icns
    dbhandler/chart.ico
    dbhandler/chart.r
    dbhandler/chart.xpm
    dbhandler/descrip.mms
    dbhandler/doc.cpp
    dbhandler/doc.h
    dbhandler/doc.icns
    dbhandler/doc.ico
    dbhandler/doc.r
    dbhandler/doc.xpm
    dbhandler/docview.bkl
    dbhandler/docview.cpp
    dbhandler/docview.h
    dbhandler/docview.r
    dbhandler/docview.rc
    dbhandler/docview_vc7.vcproj
    dbhandler/docview_vc8.vcproj
    dbhandler/docview_vc9.sln
    dbhandler/docview_vc9.vcproj
    dbhandler/docview_vc9.vcxproj
    dbhandler/docview_vc9.vcxproj.filters
    dbhandler/docview_vc9.vcxproj.user
    dbhandler/mainframe.cpp
    dbhandler/mainframe.h
    dbhandler/makefile.bcc
    dbhandler/makefile.gcc
    dbhandler/makefile.unx
    dbhandler/makefile.vc
    dbhandler/makefile.vms
    dbhandler/notepad.icns
    dbhandler/notepad.ico
    dbhandler/notepad.xpm
    dbhandler/rcdefs.h
    dbhandler/res/blank.cur
    dbhandler/res/bullseye.cur
    dbhandler/res/cdrom.ico
    dbhandler/res/colours.bmp
    dbhandler/res/computer.ico
    dbhandler/res/cross.cur
    dbhandler/res/csquery.bmp
    dbhandler/res/database.xpm
    dbhandler/res/drive.ico
    dbhandler/res/file1.ico
    dbhandler/res/floppy.ico
    dbhandler/res/folder1.ico
    dbhandler/res/folder2.ico
    dbhandler/res/hand.cur
    dbhandler/res/index.png
    dbhandler/res/magnif1.cur
    dbhandler/res/odbc.png
    dbhandler/res/odbc1.png
    dbhandler/res/odbc1.xpm
    dbhandler/res/pbrush.cur
    dbhandler/res/pencil.cur
    dbhandler/res/pntleft.cur
    dbhandler/res/pntright.cur
    dbhandler/res/removble.ico
    dbhandler/res/roller.cur
    dbhandler/res/sample.ico
    dbhandler/res/std.ico
    dbhandler/sample.rc
    dbhandler/view.cpp
    dbhandler/view.h
    dbhandler/viewbase.cpp
    dbhandler/viewbase.h
    dbhandler/wx.rc
    dbinterface/ReadMe.txt
    dbinterface/SQLite/sqlite3.h
    dbinterface/SQLite/sqlite3ext.h
    dbinterface/database.h
    dbinterface/dbinterface.sdf
    dbinterface/dbinterface.sln
    dbinterface/dbinterface.suo
    dbinterface/dbinterface.vcxproj
    dbinterface/dbinterface.vcxproj.filters
    dbinterface/dbinterface.vcxproj.user
    dbinterface/stdafx.cpp
    dbinterface/stdafx.h
    dbinterface/targetver.h
Please move or remove them before you can merge.
Aborting

大多数这些文件来自Windows / Linux项目。 但是有些文件是特定于Xcode的。

现在，在我收到此错误后，我尝试这样做：

Igors-MacBook-Air:dbhandler igorkorot$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 87 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

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

    .DS_Store
    Build/
    dbhandler/
    dbhandlerTests/
    dbinterface/
    dbloader/
    dialogs/
    odbc_lib/
    sqlite_lib/

nothing added to commit but untracked files present (use "git add" to track)

那我该怎么办？ 如何添加特定于Xcode的文件/文件夹以及应该将哪个.gitignore文件保留为未跟踪？

感谢您提供的信息，希望我没有搞砸Xcode中的项目。