Closed HackXIt closed 3 months ago
Potential future error with OS fixed in: 7fe8c99faaa7dbc1ba8875f05d675ef5f106dc02
Described error from User fixed in: a31c7f4a80cc13c0f357adfeb7ffde9df87eac4d
If you want to bring the fixing commits over to the other branch where user is testing things, you'll need to do this:
git cherry-pick <COMMIT-HASH>
in this specific case:
git cherry-pick a31c7f4a80cc13c0f357adfeb7ffde9df87eac4d
Obviously you'll need to have pulled that commit BEFOREHAND, so if you don't have it, please do
git pull --all
or
git checkout develop_ui_fixes && git pull
and then
git checkout develop_breaks && git cherry-pick a31c7f4a80cc13c0f357adfeb7ffde9df87eac4d
Thank you! I added the commits to the branch with the cherry-pick commands
fixed by #9