By mistake commit some code in GIT!

[Akshesh Panchal]

I made some changes inside ServiceImpl.java and when i was about to commit in repository it shows me you had some changes in .project file. The changes are...

+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>.

and by mistake i commited it in repository, And i saw some confliction error.
i removed the code form .project file! and recommit it, and i saw the same error again! :-/

how to resove it ? 
Please help me! 

[Boris Georgiev _Appfire_ · Accepted solution]

This should indicate that you're trying to commit changes to a file that was deleted from the repository I suppose. Try to soft reset your change to the point where you've got no changes in the .project file and then add the .project file to "ignored" and commit again.

[Akshesh Panchal]

@BorisThanks its done :D

[Boris Georgiev _Appfire_]

would you mark the answer as accepted please ?

[Akshesh Panchal]

@Boris

Thanks for your reply

Some, damn! confliction error.... "changed in source but deleted in destination"

[Boris Georgiev _Appfire_]

What is the error you see ?