http://bugs.winehq.org/show_bug.cgi?id=29635
--- Comment #5 from cobaltjacket@gmail.com 2012-01-19 02:06:57 CST --- I have almost no experience with git. I did
% git checkout master % git revert 768300c8aa2f977d14910610b8646582f9b376c9 error: could not revert 768300c... winhttp: Implement WinHttpGetProxyForUrl. hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' % cat .git/MERGE_MSG Revert "winhttp: Implement WinHttpGetProxyForUrl."
This reverts commit 768300c8aa2f977d14910610b8646582f9b376c9.
Conflicts:
dlls/winhttp/session.c
(unsurprisingly, since this is such an old and large commit)
I found lines like "<<<<<< head" and "====" and ">>>>> parent ..." . If there is a really nice tutorial that covers this bit of detail about git, I'd appreciate a reference.
I would like to confirm that 1. These three kinds of lines are the only kinds of lines that are added to files. 2. Between "<<<< head" and "===" is what is at HEAD. 3. Between "====" and ">>>> parent of ..." is what was at the parent (immediate predecessor?) of the reverted commit.
If these are the case, then I think it was appropriate (for testing) to just erase all of these lines. That said, I did this and compiled. The error was resolved. The code added in this commit is causing the crash.