EGit Validation Conflict - Cannot Reset

I have 2 branches: master and development. I develop into "evolve" and perfect everything that I need. What remains (file generated by the program: .out) I didn’t care! Therefore, when I switched to the branch, I was offered the following:

enter image description here

I clicked "Reset", but instead of switching to a branch, I was offered the same "Checkout Conflicts" windows with exactly the same options. I hit "Reset" again, however the above process just repeats. I clicked for a while - no help would be repeated again and again. Moreover, I came across the same scenario on different eclipses (Juno, Kepler) and different OSs (Mac and Windows).

Am I doing something wrong? I do not want to comment or store the file, I just want it to be reset. This is mistake? Or is there a solution?

Thanks.

+4
source share
1 answer

Add *.out to your .gitignore to get rid of these files once and for all.


In my egit version, when I select reset, the reset window opens. Looks like an error in your version. Try updating egit (not just eclipse).

If it still does not work, you can also use Team -> Reset... to perform a reset. After that, you can change the branches.

There are actually several more ways to kill a file:

  • just delete the file
  • commit it, and then reset the branch before committing before (effectively get rid of this commit)
  • commit it and then run git rebase -interactive and remove the corresponding line

Feel free to edit this post and add more ways to forcibly destroy a file from git!

+3
source

Source: https://habr.com/ru/post/1500792/


All Articles