Description
After pushing up a feature branch, I noticed that my local develop branch was very out of sync with the remote develop branch . Seemed like the entirety of the git project history were "new" local changes, and the remote branch had one ahead of me. Did not find anything out of the ordinary in my reflog dealing with the develop branch.
Decided to drop my local develop and pull the remote. Now my develop branch starts with a single "merge branch" commit that seems to be a condensed commit of all the file changes since the beginning of the project (but cannot be expanded) and the commit date on it is Dec 31, 1969. The list view of this commit incorrectly shows me as the author, but clicking into the commit shows the actual author.
I've looked at the repo graph in Gitlab and the branches/tree all seem fine, and the SHA for this "merge branch" commit is the same on my machine as it is elsewhere.
I can no longer view file/line history/git blame for changes that were made before this "merge branch" commit.
If I look at older feature branches made prior to this commit, they exist on a totally different git tree than what the current develop branch is on.
Steps to reproduce
??
Expected behavior
Be able to see all the prior commits on develop prior to the "merge branch" commit that appears to currently be the first commit and to see the file history prior to that commit
The "merge branch" commit should be expandable and have the correct author and date
Version info
Description After pushing up a feature branch, I noticed that my local
developbranch was very out of sync with the remotedevelopbranch . Seemed like the entirety of the git project history were "new" local changes, and the remote branch had one ahead of me. Did not find anything out of the ordinary in my reflog dealing with thedevelopbranch.Decided to drop my local
developand pull the remote. Now mydevelopbranch starts with a single "merge branch" commit that seems to be a condensed commit of all the file changes since the beginning of the project (but cannot be expanded) and the commit date on it is Dec 31, 1969. The list view of this commit incorrectly shows me as the author, but clicking into the commit shows the actual author.developbranch is on.Steps to reproduce ??
Expected behavior
developprior to the "merge branch" commit that appears to currently be the first commit and to see the file history prior to that commit