Note: rebase of master
Moderator: GZDoom Developers
-
- Lead GZDoom+Raze Developer
- Posts: 49183
- Joined: Sat Jul 19, 2003 10:19 am
- Location: Germany
Note: rebase of master
A few days ago I had to temporarily revert a PR in master. Now that this got addressed I decided to eliminate the revert commit and do a force push to allow proper attribution of the changes later. The branch was reset by one single commit that had been present for a few days only. Please make sure that your next pull gets applied properly.
-
- Posts: 13793
- Joined: Tue Jan 13, 2004 1:31 pm
- Preferred Pronouns: She/Her
Re: Note: rebase of master
For those that did do pulls with the now gone commits:
You'll then have to cherry-pick your work on top of that, if you had any.
Code: Select all
git checkout -b mybranch_2022_10_14
git fetch origin
git checkout -B master origin/master