Closed zachary-cauchi closed 4 months ago
You should probably rebase this branch on master.
Done. According to git, the branch is up-to-date with master. Already synced with master after the previous pr was merged. Have a habit of merging to sync instead of rebasing.
Are you sure it's up to date with my master and not simply yours? :p
I first synced my fork with your master, then I did a git merge from my master into this branch. Lemme check and confirm just to be sure.
GitHub is showing your GIF commits as things to merge, but they're already in master.
Maybe I can abandon the pr and branch, create a new one from master, then cherrypick the commits from this branch onto it?
That would work. Or alternatively I should have stuck to my principles and rebase-and-merged your branch instead of just merging it like my coworkers urge me to do.
On Sun, 7 Apr 2024, 14:43 Zachary Cauchi, @.***> wrote:
Maybe I can abandon the pr and branch, create a new one from master, then cherrypick the commits from this branch onto it?
— Reply to this email directly, view it on GitHub https://github.com/Ravenslofty/prussia/pull/11#issuecomment-2041476030, or unsubscribe https://github.com/notifications/unsubscribe-auth/AALPDW2LQ3WEOAQ5WRJFPALY4FEOLAVCNFSM6AAAAABF3KQWC6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDANBRGQ3TMMBTGA . You are receiving this because you commented.Message ID: @.***>
Ah, I see you too are a man of work culture. I'll begin the process then. I'll close this an open a new pr in a few minutes.
Sure.
My name is Hannah by the way.
Pleasure. I'm Zach (although that might have been obvious).