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!
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.
As a project manager, I have discovered that different developers want to bring their previous branching method with them when they join the team. Some developers are used to performing individual wo...
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!
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