By mistake commit some code in GIT!

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!

3 answers

1 accepted

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.

@BorisThanks its done :D

would you mark the answer as accepted please ?

What is the error you see ?

@Boris

Thanks for your reply

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

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Nov 06, 2018 in Bitbucket

Upgrade Best Practices

Hello! My name is Mark Askew and I am a Premier Support Engineer for products Bitbucket Server/Data Center, Fisheye & Crucible. Today, I want to bring the discussion that Jennifer, Matt, and ...

402 views 5 9
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you