Khane
Got something right about marriage
- 20,814
- 14,603
Yeah I never use the web tool either. I didn't fully examine exactly what steps he took but I recognize the behavior. His target code files had been updated by something else and merged to production which was the default head of the repo. So when he pulled back down to his remote branch it just overwrote it. As his changes were not yet committed despite being in the webui.
He was in a branch that was never merged to production. The issue was that he was like a million commits behind in that branch due to dropping the project for some months. He pulled from master and the files he was trying to work on were updated by other development and overwrote his remote branch with the "new" version of the files in terms of where he was behind in the commits.
Okay this makes more sense to me now that you've explained it. And to be honest I think this would have happened even if he had cloned the repo locally and created a remote branch the correct way because I'm pretty sure this guy would have forgotten to commit his work either way. That's what happened here, he did his work via the web tool on the remote branch but never committed it so it got blown away when he did a pull, which would have happened to his local copy as well.
- 1