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/
themes/city_magazine/css/city_magazine.css' remains in conflict

kind regards,
Andrei

-- 
You received this message because you are subscribed to the Google Groups 
"Versions" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/versions?hl=en.

Reply via email to