Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolve #183 invalid default string next to Save .ini File btn #314

Closed
wants to merge 1 commit into from

Conversation

samiebee43
Copy link
Contributor

#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:

self.lb_save_result.setText("calibration will be saved to %s" % self.pathname)

@samiebee43
Copy link
Contributor Author

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

@samiebee43 samiebee43 closed this Oct 11, 2023
@samiebee43
Copy link
Contributor Author

Also, this means sbee-doc is safe for deletion and should be deleted.

@samiebee43 samiebee43 deleted the sbee-doc branch October 11, 2023 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant