8000 Flip by MohamedElkamash · Pull Request #3 · aprilnovak/moose · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
8000

Flip #3

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
Open
wants to merge 5,875 commits into
base: next
Choose a base branch
from
Open

Flip #3

wants to merge 5,875 commits into from

Conversation

MohamedElkamash
Copy link

moosetest added 30 commits April 10, 2023 14:18
Merge commit 'aa09c949d20d5f5a4a446f5e5b9e0cf5296b4a0d'
cb1ac8f
Merge commit '9b0e7bbfc89a52d62096f02ac6997a3217d2fb62'
45ae64b
Merge commit '809573ef91dae8b6c4cea95ba52b99baedf1b193'
a59fd3d
Merge commit 'f0c82f7eda772c976247c8b501be080b8380ceb5'
2da0ccf
Merge commit '5871c2d0af5459c4e30db8babe51dc2dda5bd3b0'
cbc42cc
Merge commit '00f405f1e2554a389d4e3fec00e37ed356d16988'
5e60aeb
Merge commit 'add361ae3b940cfac12cf51596fcd4a98c52ed6d'
c9d8e09
Merge commit 'f25cf09585b143f39cf086f6db3e1e18a35fb888'
dd530e1
Merge commit '6f977b9b55ed13b50dd3a9665158bdee825d0811'
e02528b
Merge commit '66a35faa4822c9c7d61a751a9e19359adae0ab9b'
cc207bc
Merge commit '1542ca05a186584a315c5643fec9329c9d2b5478'
ff9a2bc
Merge commit 'ad60f5de640e194a930b4a0934ee671e79d6143d'
a344e45
Merge commit '0d1f17d47137f87a12da2aaf65458e4feb14277a'
2f26332
Merge commit '00003a76488693d5786809b729719214eb95d880'
572ac81
Merge commit '7ff6c3f8f60dcf7e7631d8c9c306ff436c0b6b78'
f78e8ac
Merge commit '6c94d0097b1f1b5f6306b0718da8e39806109e97'
13f46f0
Merge commit '628ea92c69a41195eb6ee8f050c3c696bd48fc6b'
b5e0609
Merge commit 'e84297e188dde47ffd658f7e933959f4d203c443'
eea412a
Merge commit '65baa72b5db60d56f45204d470436058db59b8e3'
2beb578
Merge commit '6051fa3507fbebb9fa4c6d475fddca1bde72d6c4'
04b65d5
Merge commit '7cf2574cb583bfbc715207fa68e4dc1cc54fd92f'
4bfe948
Merge commit 'bf63ca8c79d3b860b75f3bdd5ead361367ea2108'
d9aa89a
Merge commit 'c2d779914fbd8b46e16ac8019a5e2d92c18eee7e'
5d02fd4
Merge commit '1f9ccb558414f1a30001d14888509596bd8cfe5a'
8a656a6
Merge commit 'c5d4168914f9b40d5a48de18d69cbeac1845c7d1'
6f5b0e5
Merge commit '7e596c0b83dde472b5728d666ffab67849546c42'
396c3f6
Merge commit '2a048be44daac9b4c7fb3f3c265284df72987408'
16d1a18
Merge commit '0dd4ff8fe7ac3a46b9bfb3db6c3c4b52fea9540b'
14271c2
Merge commit '5535bb3eef136a67b9468fa0e1b91517acb7840c'
d89c423
moosetest and others added 26 commits October 27, 2023 08:13
Merge commit '4c63320b8f15433614313955a2380f34e1c03066'
4e5548c
Merge commit 'a135b2ecc005d5e4f6319b19c509ca67741f83f7'
ec5295b
Merge commit 'c0703779afe3188f486bbd6e231aecc1e21c8ad4'
7061d9b
Merge commit 'f1b7bfa6b92d76ae14f4944e0f96561980e933d6'
ce11438
Merge commit '2cb5a34b5b6112a4ea28675d73eab29492593d6b'
0b5fc59
Merge commit '6a27c4773a45d55b3d72212d25c6cdb29805b3c5'
ef947ab
Merge commit '191b9de91d4081667f32371afdeb531d9f0821e2'
e7a0fd6
Merge commit 'b280194ef36db4885146f1a50e3de840d5ae2a57'
dcb7137
Merge commit '29fb3b620b42a26c621b74e975d0272fd2eb7080'
1d66d37
Merge commit '0bd241aa89bc9c998aa66289a0901b28e20fe42d'
3534f2d
Merge commit '445341c6a998371153f9073b8a42bc0438d6d323'
8b52664
Merge commit 'f07619acc231d07003f7625ad27acd66306f4c62'
e1c3d90
Merge commit '81c558abe49172c44dec3ca264869d80d2a2a25b'
00f22ac
Merge commit 'bda7b77223cd3be68048f179a0fd31a3c8878e33'
c182999
Merge commit '2f9664cc99660fa93efe982a1738e9d37ea43054'
9de1ffd
Merge commit 'e4e6c092437ebbd0e0e6830b6e4b87ce750ce323'
6152da8
Merge commit '290de1fabc2fb2e0942124b33a05fd36721f432a'
24cbe0b
Merge commit '26072ad7c861db5410ec1d1a33332808f75bdaee'
2810766
Merge commit 'ed69223cfe138f1147bf4974200e4456fa9bf4f1'
4eba511
Merge commit '5dfe9524b833c330429113a972e3984fff97c3c2'
8493e11
Merge commit '2685792d669280dfe43c8a956c5d41683e00cc36'
c2341ca
Merge commit 'f9104dec676c76cf2b78be4e1b80eb7fda799536'
67c4cda
Merge commit '2a397e13fdb83e5bf9f5a463f4196eacca670e42'
d7520d0
Merge commit 'ec85e86826fda2e21ce63bb3a8594ec63bdb07d7'
4c42a6b
@MohamedElkamash
added FlipSidesetGenerator
234734c
@MohamedElkamash
added tests
d6f304e
@aprilnovak
Copy link
Owner
aprilnovak commented Dec 5, 2023 •
edited
Loading

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

8000
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
Reviewers

@lindsayad lindsayad Awaiting requested review from lindsayad lindsayad is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MohamedElkamash @aprilnovak
0