Here is what he said:
There was a merge conflict, so I chose mine.
I see that my changes have completely disappeared. There is an end, but if I go to GitHub and click "history" for the file, nothing shows that my changes were there. I have found a guilty commission, but all he says about it is:
Conflicts:
.../<file>.js
What I saw looked suspicious, this is a commit:
Merge remote-tracking branch 'origin/development' into devenv
But development- our remote branch, so I assume that it merged with its local branch, picked it up, and then accidentally pressed its local branch on development.
Is this the reason for the behavior that I described? Any ideas on a clean way to fix this?
: , cherry-pick , , . (Git ).