Hi,
Just wondering how I am able to resolve this, see below (ie resolve
files that are in conflict, as I am not the only one working on this
project).
Commit failed (details follow):
Aborting commit: '/Applications/MAMP/htdocs/countryhomeideas/sites/all/
A conflict occurs when you update a file, and changes from the repository
conflict with changes local to your working copy. (Incidentally, this can
happen even with only one person working in a repository; I've occasionally
made changes to fix different things in different working copies, then
I really really wish Sofa would have the same kind of user feedback
system as Those Other Guys, so that we knew they were listening and
responding to feedback. I know people have been begging for merge/
switch capability from the beginning, but the lack of acknowledgment
from the development team
