Skip to main content

Indie game storeFree gamesFun gamesHorror games
Game developmentAssetsComics
SalesBundles
Jobs
TagsGame Engines

Oh My Git!

An open source game about learning Git! · By blinry, bleeptrack

Bug: changing-the-past: Rebasing

A topic by Silver Key Games created Mar 09, 2021 Views: 253 Replies: 1
Viewing posts 1 to 2

On the rebasing level, no matter which order you rebase them in, the automatic merging leaves the Baguette changes out. Manually editing them back in also doesn't work. Been at this level several times and it seems un-doable.

(1 edit)

This is no matter which branch you start with as the base and no matter which order you rebase the other 2 onto it.

Even though the coffee branch is coming off the baguette branch (ie you got coffee AFTER getting a baguette), it still says 'You do not have a baguette' although it should already have been eaten.