Skip to content

Flip#3

Open
MohamedElkamash wants to merge 5875 commits intoaprilnovak:nextfrom
MohamedElkamash:flip
Open

Flip#3
MohamedElkamash wants to merge 5875 commits intoaprilnovak:nextfrom
MohamedElkamash:flip

Conversation

@MohamedElkamash
Copy link

moosetest added 30 commits April 10, 2023 14:18
moosetest and others added 26 commits October 27, 2023 08:13
@aprilnovak
Copy link
Owner

aprilnovak commented Dec 5, 2023

Looks like your branch you are pushing into my next branch has got quite a different git history on it. To fix this, let's go onto a new branch and cherry-pick your two commits onto it.

cd cardinal
git fetch april
git checkout -b flip-fresh april/next
git cherry-pick 234734c781cf
git cherry-pick d6f304ea417a2c

What these lines are doing:

  • git fetch april: Make sure you have the most up-to-date copy of my next branch on your computer
  • git checkout -b flip-fresh april/next check out a new branch on your computer, named flip-fresh, which is a mirror of my next branch
  • git cherry-pick <hash> applies the changes from your two commits on top

@MohamedElkamash
Copy link
Author

Why should I change the directory to cardinal?

@aprilnovak
Copy link
Owner

Sorry, you are correct - that should be moose.

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.

2 participants