Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature two new merge #7

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Feature two new merge #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de402b8
Updated game location
pratyay7 Oct 8, 2021
7b84af5
Update README.md
pratyay7 Oct 8, 2021
85cc31e
Merge pull request #1 from pratyay7/newBranch
pratyay7 Oct 8, 2021
21a870c
Update index.html
pratyay7 Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A project based learning activity for people who are getting started with branching with Git.

You can play the game at: https://githubschool.github.io/thirty-minutes-to-merge/
You can play the game at: https://githubschool.github.io/thirty-minutes-to-merge/pratyay7

>> _*SUPPORTED BROWSERS*: Chrome, Firefox, Safari, Opera and IE9+_

Expand Down Expand Up @@ -69,5 +69,7 @@ Choose a branching strategy that works for you, here are some things to consider

While following along, if you don't want to create the branches and make modifications to the files in the repository you can use the following branches when we discuss a Git Flow workflow:

thisi is a change new change

- `ex-changespeed`
- `ex-changecolor`
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

<div id="tetris">
<div id="menu">
<p id="start"><a href="javascript:play();">Press Space to Play.</a></p>
<p id="start"><a href="javascript:play();">Press Space to Play game with Pratyay.</a></p>
<p><canvas id="upcoming"></canvas></p>
<p>score <span id="score">00000</span></p>
<p>rows <span id="rows">0</span></p>
Expand Down