| All branches say # WARNING after merge [message #1864579] |
Tue, 26 March 2024 14:32 |
Eclipse User |
|
|
|
See Fig 1. This happened after I attempted to merge debug-01 into test-01. The green text in the Commit Message was added by EGit. # WARNING was referenced in this Egit post (https://www.eclipse.org/forums/index.php/t/1034963/) which suggests something or someone else changed HEAD but I don't see how that could have happened especially since it affected all branches.
In Fig 2, Git Staging now says "Merged" for all branches.
Fig 3 shows the repo info and History graph. Branches for main and test-01 are on the remote but debug-01 is only local. I verified the last commit on the remote for test-01 is fbca.
I'm presently using EGit 6.8.0.2023 but I think this repo and merge attempt were done using EGit 6.5.0.2023.
The only unusual thing about this repo is there isn't an Eclipse project. This means the contents of the Notes.txt view may be from a different branch (gets updated when I click in that view).
I want to be able to reproduce this "problem". How do I restore it to the state prior to the merge attempt? What steps could I perform to intentionally recreate this situation?
|
|
|
Powered by
FUDForum. Page generated in 0.03273 seconds
Home