Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Attachment #196710
screenshot saying my merge failed image/png 2011-05-26 18:50:00 EDT 95.22 KB no flags Details
Attachment #196711
git-status page after merge failure image/png 2011-05-26 18:54:41 EDT 161.42 KB no flags Details