Cannot pull/push my git repository anymore. “Merge conflicts”
问题 I have made changes to my project repository in several files. Then i commited and didn't pushed em. Later i've found a bug in code and opened git log to revert the last commit. Since i did it this commit has disappeared from log, and i cannot both push or pull repository due to an error. I've tried making a new commit but this only changed the error message on pull/push: An error was raised by libgit2. Category = 21 (MergeConflict). 5 uncommitted changes would be overwritten by merge git