Note: rebase of master

Here, developers communicate stuff that does not go onto the main News section or the front page of the site.
[Dev Blog] [Development Builds] [Git Change Log] [GZDoom Github Repo]

Moderator: GZDoom Developers

User avatar
Graf Zahl
Lead GZDoom+Raze Developer
Lead GZDoom+Raze Developer
Posts: 48325
Joined: Sat Jul 19, 2003 10:19 am
Location: Germany

Note: rebase of master

Post by Graf Zahl »

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.
User avatar
Rachael
Admin
Posts: 13084
Joined: Tue Jan 13, 2004 1:31 pm
Preferred Pronouns: She/Her

Re: Note: rebase of master

Post by Rachael »

For those that did do pulls with the now gone commits:

Code: Select all

git checkout -b mybranch_2022_10_14
git fetch origin
git checkout -B master origin/master
You'll then have to cherry-pick your work on top of that, if you had any.

Return to “Developer Blog”