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.

Sign up for GitHub

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

Jump to bottom

Change from mollusc to limpet #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −2
Open

Change from mollusc to limpet #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62d25a1
Change from mollusc to limpet
claresudbery Apr 13, 2023
8c56f98
notes on rebase
claresudbery Apr 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion GitPlayground/OtherThingDoer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ private static string CatchACrab()
public static string FindAMollusc()
{
NumMolluscsFound++;
return " Mollusc.";
return " Limpet.";
}

public static void Start()
Expand Down
4 changes: 3 additions & 1 deletion Merging-examples.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
- I did another `gup` (pull, merge, rebase)
- This time I skipped all the merge conflicts (four this time - both the original commits and the reverts of those commits
- I tried `git cherry-pick` on the original commits, but of course that didn’t work because of the same problems - merge confiicts
- !! Because I skipped the merge conflicts this also means the original commits AND their reverts were all LOST from the timeline - the commits are no longer visible in the branch, either locally or remotely, not even if you add the commit ID to a relevant url
- !! Because I skipped the merge conflicts this also means the original commits AND their reverts were all LOST from the timeline
- the commits are no longer visible in the branch, either locally or remotely, not even if you add the commit ID to a relevant url
- !! BUT this is because I was effectively doing `git pull --rebase` - the rebase means that all commits are summarised into one line of changes. I'm pretty sure if it wasn't a rebase, you'd see two parallel branches in the commit history, and onf them would include the reverted commits
- So I used `git reflog` to see the orignal commit IDs
- Then `git diff [commit id] [commit id]` to see the changes introduced by those commits
- Then manually made same changes again
Expand Down