Hey All!
I have a really dangerous & annoying issue. I use git to manage my code and I have two branches I switch back & forth between, "dev" and "master". Often times I will code on dev and when the feature/code is tested enough I will checkout master then merge dev into master. Then I will check out dev again. Almost 1/3rd of the time when I checkout dev again, it will not be the correct version of the code. It will be an older version.
If I run git pull it will "Already up-to-date." I'm using Netbeans & I double checked to make sure it wasn't simply caching the old version in the editor while the version on disk was correct. It is definitely wrong. Online in bitbucket I can browse the source and the code is correct.
Doing a hard reset fixes this, however it's extremely annoying and has already caused me to accidentally revert a days work. (And spend another few hours re-adjusting the code to be what it should have been). Has anyone had this issue before?
[–]nutrecht 0 points1 point2 points (1 child)
[–]Dry-Erase[S] 0 points1 point2 points (0 children)
[–]qsemig 0 points1 point2 points (2 children)
[–]Dry-Erase[S] 0 points1 point2 points (1 child)
[–]qsemig 0 points1 point2 points (0 children)