|Hard reset isn't erasing local commits [message #1779100]
||Tue, 02 January 2018 19:53
| David M. Karr
Registered: July 2009
Using Eclipse 4.7.2 and egit 188.8.131.52712302008-r.|
I'm on the master branch on a repo, which I've been working on for a long time, although I haven't committed or pushed anything for a week or two. Today I made some changes to a file, verified it was what I wanted, and then committed and pushed.
Surprisingly, it was rejected, saying something about "not fast forward merge".
Looking at the repo list, I see "^2" (uparrow, not caret), which is surprising, as I only attempted to commit and push one file).
So, I decided to start over, saving the changes I needed to make in an external file, and then selecting "Reset..." and then "Hard'. I've used this technique many times. Today, it seemed to do nothing. It did say it was resetting, and showing progress, but when it was done, my changed file was still in the state I had changed it to, and the repo list still shows "^2".
Powered by FUDForum
. Page generated in 0.02268 seconds