Exo2
Alice and bob are working together on tinyc.games. They both forked the repository:
Alice forked
superjer/tinyc.games: https://github.com/alice/tinyc.gamesBob forked
alice/tinyc.games: https://github.com/bob/tinyc.games
Task1:
Alice will create a branch named
feature/backgroundcolorsand make it possible to change the background colors by pressingbBob will create a branch named
feature/pillarcolorsand make it possible to change the pillar colors by pressingp
So far, both of them will push their feature branch in their own fork
Task2:
Alice's should merge her
feature/backgroundcolorsintomainBob will issue a pull request from his
feature/pillarcolorsto Alice'smainbranchAlice and Bob will review the pull request, solve conflicts and merge into Alice's
mainbranch
At the end, the main branch of Alice's fork should contain a version of the flappy game that supports both changing the background and the pillar colors.
Last updated