kintsugi asking me to resolve conflict manually

[Ochornma]

I ran this command to help me resolve the conflict I'm having

kintsugi Bamboo.xcodeproj/project.pbxproj

This was the response i got

Trying to remove value '2', but the existing value is '6'. This is considered a conflict that should be resolved manually.

[byohay]

Hey @Ochornma!
I believe that the error occurs because Kintsugi actually bumped into a real conflict that it can't resolve in its own.
From the message you received, I understand that in "ours" commit, the value was changed from 2 to 6, while in "theirs" commit the value 2 was supposed to be removed. Kintsugi doesn't know if you decide to keep the value 6 or remove it.

[byohay]

I'm closing this. If you think we can make the message more informative, please let me know