Team,
We are facing big problem in my repository.
Scenario:
1) Got Conflicts (Used Android studio)
2) Merged and commit the changes
3) It reverted the old commits.
4) In bitbucket commit history, all the commits listed but in the individual file history commits are missing. So recent changes are missing.
Expecting quick help on this