Github issues

[henry-casita]

Me and my teammate are having numerous issues with github.
When trying to git push to my branch, I am told everything is up to date even though this is not the case. When trying to pull, I can't do it because of unmerged files. My partner lost a bulk of his work locally yesterday because somehow it got deleted when he tried to switch branches. We are not sure what is wrong with our github and would appreciate help on how to proceed.

[ymherklotz]

Hi, I can't help much without more details, it could be failing a pull for many reasons such as uncommitted changes locally, or files that weren't added locally, or it's just going into a merge and it needs manual intervention to fix the conflicts.

And about lost work, the only ways to lose work with git is using git clean or deleting files before they were git added. Otherwise, you can always check git reflog and should be able to find the point in time before you accidentally did a change with git.