Closed samiebee43 closed 10 months ago
I'll take it as a bug and have decreased trust in Github's branch comparison from now on.
The equivalent comparison is done on CLI this (roundabout) way:
# make sure both local branches are up to date
git checkout sbee-doc
git pull
git checkout main
git pull
# create a temporary copy of main
git checkout -B tempMain
# merge sbee-doc
git merge sbee-doc
# (it will create a merge commit no matter what)
# verify that the last commit actually changed something
git diff HEAD~
# in this case it didn't, so we can conclude that sbee-doc is actually NOT ahead of main (even though github claims it is)
# clean up
git checkout main
git branch -D tempMain
Also, this means sbee-doc is safe for deletion and should be deleted.
183 is labeled as closed, so why does this old branch appear ahead of main by one commit ?
We can even see the line this introduces on main: https://github.com/WasatchPhotonics/ENLIGHTEN/blob/82d913ce2497e89d68243dc057d81d8c62c203e6/enlighten/file_io/Configuration.py#L92