pcottle / learnGitBranching

An interactive git visualization and tutorial. Aspiring students of git can use this app to educate and challenge themselves towards mastery of git!
https://pcottle.github.io/learnGitBranching/
MIT License
30.34k stars 5.73k forks source link

Remove compareOnlyMainHashAgnostic flag from Interactive Rebase level #1079

Closed SoumyaBhattacharjee closed 1 year ago

SoumyaBhattacharjee commented 1 year ago

This is regarding Issue #1068
For interactive rebase level compareOnlyMainHashAgnostic flag was set to true, removed this flag such that it compares other branches too

netlify[bot] commented 1 year ago

Deploy Preview for xenodochial-hugle-b9ec84 ready!

Name Link
Latest commit eeeeec494ee49f28a569a07f119043d1084108aa
Latest deploy log https://app.netlify.com/sites/xenodochial-hugle-b9ec84/deploys/6497fd5b279632000820b171
Deploy Preview https://deploy-preview-1079--xenodochial-hugle-b9ec84.netlify.app/
Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

pcottle commented 1 year ago

This is actually intentional, and why we have that little disclaimer about only main being checked: Screenshot 2023-06-27 at 3 20 58 PM

Most people solve the level with git rebase -i HEAD~4 which doesn't rebase the C1 commit, which means that other branch will stay where it is. but at the end of the day, where that branch ends up doesn't really matter -- just what the sequence of commits are on main.

is there another way to make this more clear? or I can also remove the overHere branch as well

pcottle commented 1 year ago

The reason why the overHere branch exists is for this shorthand:

git rebase -i overHere

SoumyaBhattacharjee commented 1 year ago

Okay, I got the point about the overHere branch, but the other concern still is that the commit hash of c1 is getting changed and we were not allowing that in some other levels. For example, I have tried the same thing for level 1 and it is not getting passed LearnGitBranchingLevel1Cropped

pcottle commented 1 year ago

That's what the "hash agnostic" part of the flag means. We don't care about if C1 got amended slightly, just the final order of the commits.

SoumyaBhattacharjee commented 1 year ago

Okay got it, will close this then. Thanks for explaining