query: Git fails to merge or pull local repos
positive_passages.docid: 16196
positive_passages.text: How to resolve merge conflicts in Git repository?
negative_passages.docid: 17563
negative_passages.text: Can git be integrated with Xcode?
negative_passages.docid: 105558
negative_passages.text: How do you clone a Git repository into a specific folder?
negative_passages.docid: 45630
negative_passages.text: Combining multiple git repositories
negative_passages.docid: 60351
negative_passages.text: How can I update to a newer version of Git using apt-get?
negative_passages.docid: 37226
negative_passages.text: Two git repositories in one directory?
negative_passages.docid: 91502
negative_passages.text: Undo git pull, how to bring repos to old state
negative_passages.docid: 17222
negative_passages.text: "Unable to connect to Upstart" error when installing git-all
negative_passages.docid: 62143
negative_passages.text: GitHub for Windows not working after install
negative_passages.docid: 27047
negative_passages.text: Git push error '[remote rejected] master -> master (branch is currently checked out)'
negative_passages.docid: 125970
negative_passages.text: How to revert multiple git commits?
negative_passages.docid: 44339
negative_passages.text: How do I tell git to always select my local version for conflicted merges on a specific file?
negative_passages.docid: 112173
negative_passages.text: When would you use the different git merge strategies?
negative_passages.docid: 70922
negative_passages.text: Using Git on Windows
negative_passages.docid: 124502
negative_passages.text: how to resolve unmet dependencies and file collisions due mixing diferent repositories?
negative_passages.docid: 62799
negative_passages.text: How to use Git for Unity3D source control?
negative_passages.docid: 152902
negative_passages.text: How to get git-completion.bash to work on Mac OS X?