That's what's called a merge conflict: Git's automatic merge tool could not revert the commit cleanly so you'll have to resolve the conflict manually, ie. edit the source code of the files that contain conflicts. The Net is full of documentation, guides and tutorials on how to resolve Git conflicts.jpqy wrote:I have followed Eelco idea..and install GitHub for windows..register myself and make a fork with Stockfish..and get same screen as Eelco when everything was setup..
Okay till here..but when i click on "revert commit" i get a window saying:
"You have unmerged files in your working directory.Resolve them and commit them before trying the revert again."
If you seriously want to maintain your own fork of Stockfish that's different from the official version then I'm afraid you'll need to learn at least the fundamentals of Git and C++ sooner or later. Forking things just ain't easy, and keeping forks in sync with upstream is definitely not easy. I'm sorry if this sounds discouraging.


