Discard local commits? (causing merge conflicts that hang on resolution)

[silverrowan]

I'm running into a problem where merge conflict edits cause the merging to hang. The easiest way for me to remedy it in this particular case is just to discard un-pushed commits, but I can't find the way to do that in this app.

Is there anywhere where I can use the normal git commands?
I'm using the ios ipad app, to gitHub.

[ViscousPot]

Hey, thanks for reaching out. GitSync doesn't use git under the hood directly, but instead something called libgit2. It means that there's sadly no terminal available.

However, you should be able to resolve your particular issue, just by using the force pull option (will discard unpushed commits and pull all remote commits)

[silverrowan]

Thank you for the quick reply.

Sadly, that ended up discarding the files I was hoping to salvage.