Maescool/Catacomb-Snatch — Issue #762: Requires merge resolution
Author: Shephiroth
Created: 2012-03-04 20:53:44+00:00
State: open

Hello, here i am again, with my git problems (this program hate me).

Today, before start with console+chat merge, i started pulling from upstream to local master. Then tried to push into origin master. And here the problem begins. Now my git is kind of paralyzed. On bash, im on .ssh/Catacomb-Snatch (master | MERGIN), on gui every time i try to commit, it says that MojamComponent "requires mergin resolution".

Help?

P.D: Bash didnt accept any new push/pull because i have unmerged files ?

HELP PLEASE!!!!!!