query: Resolving patch conflicts manually
positive_passages.docid: 145414
positive_passages.text: How to read .rej files, i.e
negative_passages.docid: 77188
negative_passages.text: "Repair" network connections programmatically/from command line
negative_passages.docid: 127856
negative_passages.text: I ran into a merge conflict. How can I abort the merge?
negative_passages.docid: 53782
negative_passages.text: Can we have some tools to handle link rot?
negative_passages.docid: 2313
negative_passages.text: How do I prevent LaTeX-Suite from opening files automatically when there's an error?
negative_passages.docid: 80106
negative_passages.text: How do I enable automatic updates?
negative_passages.docid: 126129
negative_passages.text: Syntax highlighting conflict
negative_passages.docid: 111940
negative_passages.text: Auto-updating Homebrew
negative_passages.docid: 112167
negative_passages.text: What should I do if two libraries provide a function with the same name generating a conflict?
negative_passages.docid: 138044
negative_passages.text: How can I stop the Software Updater from nagging me to restart?
negative_passages.docid: 68159
negative_passages.text: Is there a way to make Git mark a file as conflicted?
negative_passages.docid: 27650
negative_passages.text: Patching arguments inside a macro
negative_passages.docid: 95263
negative_passages.text: Problem with patching babel package
negative_passages.docid: 4305
negative_passages.text: How do I fix a "Problem with MergeList" or "status file could not be parsed" error when trying to do an update?
negative_passages.docid: 136579
negative_passages.text: Monkey Patching in Rails 3
negative_passages.docid: 115187
negative_passages.text: How do I avoid checking for updates for a specific module?
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?