Git tip: Before doing "git clean -fd" always think twice and backup the whole folder manually before doing that. Take it from me.
Also be careful with, "git pull" 😩

Oh yeah, happened to me yesterday, lost a few important untracked files !

git stash

git stash is also your best friend when you make a load of changes but, just before you commit, you notice you are on the wrong branch

Another tip is also to clone your branch for extra backup even if you are experienced. Just to be 100% sure sigh 😕

@Devnergy Why? I don't understand what are you doing wrong.

Always git clean -n first

@electrineer I'm switching to a different branch but there are lots of conflicts

@Devnergy so you have a lot of changes you can't commit before you switch branch? Maybe you need to have as many copies of the repository as the number of work items you are working on simultaneously. Git stash can be helpful here also.

Yes. Not my changes but my coworker's changes. I'll be more careful next time with git clean -fd

@Devnergy huh? Why would you dev on the same computer?

@electrineer the existing old project have not Git but recently they setup the Git for it. We have no localhost and just SSH then edit in the Dev server. Also there are 2 master branches that are not in sync but it is all sorted out now.

@Devnergy there's your problem. What is my reward for finding it?

@electrineer git stash git pop