diff --git a/assets/css/style.scss b/assets/css/style.scss index b646f652..dcd79f0d 100644 --- a/assets/css/style.scss +++ b/assets/css/style.scss @@ -44,14 +44,6 @@ li { padding-bottom: 4px; } -img { - width: 100%; - max-width: 850px; - display: flex; - margin: 30px auto 18px; - border-radius: 2px; -} - button { padding: 8px 14px; font-family: 'Source Sans Pro', 'Helvetica Neue', 'Arial', sans-serif; @@ -81,6 +73,34 @@ ul.no-list-style { padding: 0; } +/***************************** + * Figures/Images + *****************************/ +figure { + max-width: 850px; + margin: 30px auto 18px; + + img { + width: 100%; + display: block; + margin: auto; + border-radius: 2px; + + &.img_repos { + width: 50%; + } + &.img_pullrequest { + width: 65%; + } + } + + figcaption { + margin: 10px; + font-style: italic; + font-size: .85em; + } +} + /***************************** * Wrappers *****************************/ diff --git a/assets/imgs/branches-ptbr.png b/assets/imgs/branches-ptbr.png deleted file mode 100644 index ba08bd09..00000000 Binary files a/assets/imgs/branches-ptbr.png and /dev/null differ diff --git a/assets/imgs/branches.png b/assets/imgs/branches.png index ba08bd09..6200018e 100644 Binary files a/assets/imgs/branches.png and b/assets/imgs/branches.png differ diff --git a/assets/imgs/clone-ptbr.png b/assets/imgs/clone-ptbr.png deleted file mode 100644 index 2212031f..00000000 Binary files a/assets/imgs/clone-ptbr.png and /dev/null differ diff --git a/assets/imgs/clone.png b/assets/imgs/clone.png index 4a185ad2..ba06e6fe 100644 Binary files a/assets/imgs/clone.png and b/assets/imgs/clone.png differ diff --git a/assets/imgs/favicon-p.png b/assets/imgs/favicon-p.png deleted file mode 100644 index 7f3ed4c3..00000000 Binary files a/assets/imgs/favicon-p.png and /dev/null differ diff --git a/assets/imgs/favicon.png b/assets/imgs/favicon.png deleted file mode 100644 index ec7942b7..00000000 Binary files a/assets/imgs/favicon.png and /dev/null differ diff --git a/assets/imgs/pull-ptbr.png b/assets/imgs/pull-ptbr.png deleted file mode 100644 index 7c021a07..00000000 Binary files a/assets/imgs/pull-ptbr.png and /dev/null differ diff --git a/assets/imgs/pull.png b/assets/imgs/pull.png index f70c9f42..0ee262de 100644 Binary files a/assets/imgs/pull.png and b/assets/imgs/pull.png differ diff --git a/assets/imgs/pullrequest-ptbr.png b/assets/imgs/pullrequest-ptbr.png deleted file mode 100644 index bd43bbbd..00000000 Binary files a/assets/imgs/pullrequest-ptbr.png and /dev/null differ diff --git a/assets/imgs/pullrequest.png b/assets/imgs/pullrequest.png index 3d5c09dc..3c647845 100644 Binary files a/assets/imgs/pullrequest.png and b/assets/imgs/pullrequest.png differ diff --git a/assets/imgs/remotes-ptbr.png b/assets/imgs/remotes-ptbr.png deleted file mode 100644 index d48f4be5..00000000 Binary files a/assets/imgs/remotes-ptbr.png and /dev/null differ diff --git a/assets/imgs/remotes.png b/assets/imgs/remotes.png index 48ac1b03..ff247e67 100644 Binary files a/assets/imgs/remotes.png and b/assets/imgs/remotes.png differ diff --git a/assets/imgs/repos-ptbr.png b/assets/imgs/repos-ptbr.png deleted file mode 100644 index a301a3aa..00000000 Binary files a/assets/imgs/repos-ptbr.png and /dev/null differ diff --git a/assets/imgs/repos.png b/assets/imgs/repos.png index e2827eaa..74810c39 100644 Binary files a/assets/imgs/repos.png and b/assets/imgs/repos.png differ diff --git a/resources/content/challenges/10_requesting_you_pull_please.hbs b/resources/content/challenges/10_requesting_you_pull_please.hbs index 85b1be11..4417119c 100644 --- a/resources/content/challenges/10_requesting_you_pull_please.hbs +++ b/resources/content/challenges/10_requesting_you_pull_please.hbs @@ -7,20 +7,22 @@

-

- - An illustration showing two options. The latter option contains more of the alphabet than the first and is asking the first to accept its work so that the alapabet is complete. +
+ An illustration of two files. Their different color indicates their affiliation to the original repository and your forked repository respectively. The forked file contains a change to include more letters of the alphabet and is asking to pull these changes into the original file. +
+

+

- A drawing of four file folders +
+ A drawing of folders on your computer. +
+

diff --git a/resources/content/challenges/5_remote_control.hbs b/resources/content/challenges/5_remote_control.hbs index 0e82386b..0bb586dd 100644 --- a/resources/content/challenges/5_remote_control.hbs +++ b/resources/content/challenges/5_remote_control.hbs @@ -6,13 +6,16 @@

+ i18n-data="ch05~When you put something on GitHub that copy lives on one of GitHub's servers. This makes it a {/str/}remote{/str_e/} repository because it is not on your computer, but on a server, {/dqm/}remote{/dqm/} and somewhere else. By {/str/}pushing{/str_e/} your {/str/}local{/str_e/} (on your computer) changes to it, you keep it up to date.">

- A diagram showing GitHub as a central server which creates the GitHub.com website. Two computers, on either side, are pushing and pulling from GitHub. +
+ A diagram showing a central server holding a repository. Two computers, on either side, are connecting to the server. +
+
diff --git a/resources/content/challenges/6_forks_and_clones.hbs b/resources/content/challenges/6_forks_and_clones.hbs index 48309201..7b133ec9 100644 --- a/resources/content/challenges/6_forks_and_clones.hbs +++ b/resources/content/challenges/6_forks_and_clones.hbs @@ -7,13 +7,16 @@

+ i18n-data="ch06~When you {/str/}fork{/str_e/} a repository, you create a copy of it on your GitHub account. Your forked copy begins its own life as a {/str/}remote{/str_e/} repository. Forks are used for creating your own version of a project and - if desired - for contributing your changes back to the original project (such as bug fixes or new features).">

- A diagram showing a repository from GitHub copied onto your GitHub account and then copied onto your local computer from there. +
+ A diagram showing a repository on GitHub copied onto your GitHub account and then cloned onto your local computer. +
+
diff --git a/resources/content/challenges/7_branches_arent_just_for_birds.hbs b/resources/content/challenges/7_branches_arent_just_for_birds.hbs index f57faa0c..1f224380 100644 --- a/resources/content/challenges/7_branches_arent_just_for_birds.hbs +++ b/resources/content/challenges/7_branches_arent_just_for_birds.hbs @@ -7,10 +7,11 @@

-

- - A diagram showing a horizontal line, representing the master branch, with another line branching off the top and later re-joining the original. Another line branches off the master branch line from below and yet another branch branches off of that. Both of these meet back up with the original master line, too. +
+ A diagram showing a horizontal line, representing the master branch, with another line branching off the top and later re-joining the original. Another line branches off the master branch line from below and yet another branch branches off of that. Both of these meet back up with the original master line, too. +
+

- A photo of a cat with a space helment drawn on. This is Reporobot the cat and your collaborator - +
+ A photo of a cat with a space helment drawn on. This is Reporobot the cat and your collaborator +
+
diff --git a/resources/content/challenges/9_pull_never_out_of_date.hbs b/resources/content/challenges/9_pull_never_out_of_date.hbs index 1f0b2d07..db21454a 100644 --- a/resources/content/challenges/9_pull_never_out_of_date.hbs +++ b/resources/content/challenges/9_pull_never_out_of_date.hbs @@ -7,8 +7,11 @@

- A diagram shows a computer pulling information down from a repository's website +
+ A diagram shows a computer pulling information down from a repository's website +
+
diff --git a/resources/i18n/en-US/ch02.json b/resources/i18n/en-US/ch02.json index c1f2154b..b7192bbb 100644 --- a/resources/i18n/en-US/ch02.json +++ b/resources/i18n/en-US/ch02.json @@ -2,6 +2,7 @@ "Create a new repository on your computer.": "Create a new repository on your computer.", "Repositories": "Repositories", "A {/str/}repository{/str_e/} is a collection of related items. In our case, when writing software, it is a collection of files related to a software project. You can imagine it as a project folder with all the relevant files inside of it. In fact, that's what it will look like on your computer anyways. Sometimes they're called 'repos' for short.": "A {/str/}repository{/str_e/} is a collection of related items. In our case, when writing software, it is a collection of files related to a software project. You can imagine it as a project folder with all the relevant files inside of it. In fact, that's what it will look like on your computer anyways. Sometimes they're called 'repos' for short.", + "Repositories just look like normal folders on your computer. However there is an important difference: Their content is beeing tracked by Git.": "Repositories just look like normal folders on your computer. However there is an important difference: Their content is beeing tracked by Git.", "You tell Git what your project is and Git will start tracking all of the changes to that folder. This makes it a Git repository: a folder of items being tracked by Git. Git tracks when files are added, subtracted or even a single letter in a single file is changed. All of this plus who did it and when is tracked by Git. In software, tracking changes like this is called {/str/}version control{/str_e/}.": "You tell Git what your project is and Git will start tracking all of the changes to that folder. This makes it a Git repository: a folder of items being tracked by Git. Git tracks when files are added, subtracted or even a single letter in a single file is changed. All of this plus who did it and when is tracked by Git. In software, tracking changes like this is called {/str/}version control{/str_e/}.", "Using Terminal": "Using Terminal", "{/str/}Terminal{/str_e/} (or Bash) is a way to instruct your computer to do things by typing commands rather than clicking applications with your mouse. You can rename files, open files, create new folders, move between directories (folders) and more all by running typed commands. You can even use a text editor for code (like {/lnk_vim/}Vim{/lnk_e/}) in your terminal an never have to leave!": "{/str/}Terminal{/str_e/} (or Bash) is a way to instruct your computer to do things by typing commands rather than clicking applications with your mouse. You can rename files, open files, create new folders, move between directories (folders) and more all by running typed commands. You can even use a text editor for code (like {/lnk_vim/}Vim{/lnk_e/}) in your terminal an never have to leave!", diff --git a/resources/i18n/en-US/ch05.json b/resources/i18n/en-US/ch05.json index be2f5d22..fa150a34 100644 --- a/resources/i18n/en-US/ch05.json +++ b/resources/i18n/en-US/ch05.json @@ -1,8 +1,9 @@ { "Connect your local repository to a remote one and push changes to it.": "Connect your local repository to a remote one and push changes to it.", "Remotes": "Remotes", - "When you put something on GitHub that copy lives on one of GitHub's servers. This makes it as {/str/}remote{/str_e/} repository because it is not on your computer, but on a server, {/dqm/}remote{/dqm/} and somewhere else. By {/str/}pushing{/str_e/} your {/str/}local{/str_e/} (on your computer) changes to it, you keep it up to date.": "When you put something on GitHub that copy lives on one of GitHub's servers. This makes it as {/str/}remote{/str_e/} repository because it is not on your computer, but on a server, {/dqm/}remote{/dqm/} and somewhere else. By {/str/}pushing{/str_e/} your {/str/}local{/str_e/} (on your computer) changes to it, you keep it up to date.", + "When you put something on GitHub that copy lives on one of GitHub's servers. This makes it a {/str/}remote{/str_e/} repository because it is not on your computer, but on a server, {/dqm/}remote{/dqm/} and somewhere else. By {/str/}pushing{/str_e/} your {/str/}local{/str_e/} (on your computer) changes to it, you keep it up to date.": "When you put something on GitHub that copy lives on one of GitHub's servers. This makes it a {/str/}remote{/str_e/} repository because it is not on your computer, but on a server, {/dqm/}remote{/dqm/} and somewhere else. By {/str/}pushing{/str_e/} your {/str/}local{/str_e/} (on your computer) changes to it, you keep it up to date.", "Others can always then get the latest from your project by {/str/}pulling{/str_e/} your changes down from the remote (and onto their computer). This is how everyone can work on a project together without needing access to your computer where your local copy is stored.": "Others can always then get the latest from your project by {/str/}pulling{/str_e/} your changes down from the remote (and onto their computer). This is how everyone can work on a project together without needing access to your computer where your local copy is stored.", + "A server (e.g. by GitHub), holding the {/str/}remote{/str_e/} repository and two computers, each of them holding a {/str/}local{/str_e/} copy of the repository. You can either access and edit the remote repository with your browser or edit the repository locally and tell your computer (on {/str/}terminal{/str_e/}) to talk to the server.": "A server (e.g. by GitHub), holding the {/str/}remote{/str_e/} repository and two computers, each of them holding a {/str/}local{/str_e/} copy of the repository. You can either access and edit the remote repository with your browser or edit the repository locally and tell your computer (on {/str/}terminal{/str_e/}) to talk to the server.", "Create a Remote Repository": "Create a Remote Repository", "You want to sync your {/str/}local{/str_e/} version with one stored on GitHub.com. First create a new {/str/}remote{/str_e/} repository on GitHub.com.": "You want to sync your {/str/}local{/str_e/} version with one stored on GitHub.com. First create a new {/str/}remote{/str_e/} repository on GitHub.com.", "Go to {/lnk_github/}github.com{/lnk_e/}, log in, and click the '+' in the top right and then click 'New repository'.": "Go to {/lnk_github/}github.com{/lnk_e/}, log in, and click the '+' in the top right and then click 'New repository'.", diff --git a/resources/i18n/en-US/ch06.json b/resources/i18n/en-US/ch06.json index 602e2b70..b5053fb8 100644 --- a/resources/i18n/en-US/ch06.json +++ b/resources/i18n/en-US/ch06.json @@ -2,8 +2,9 @@ "Fork a project from GitHub.com and clone it locally.": "Fork a project from GitHub.com and clone it locally.", "Forks": "Forks", "So far you have made a project locally and pushed it to GitHub, but that's only half the fun! The other half is working with other people and other projects.": "So far you have made a project locally and pushed it to GitHub, but that's only half the fun! The other half is working with other people and other projects.", - "When you {/str/}fork{/str_e/} a repository, you're creating a copy of it on your GitHub account. Your forked copy begins its life as a {/str/}remote{/str_e/} repository — it exists just on your GitHub account, not on your computer. Forks are used for creating your own version of a project (this diversion from the original is like taking a fork in the road) or contributing back your changes (such as bug fixes or new features) to the original project.": "When you {/str/}fork{/str_e/} a repository, you're creating a copy of it on your GitHub account. Your forked copy begins its life as a {/str/}remote{/str_e/} repository — it exists just on your GitHub account, not on your computer. Forks are used for creating your own version of a project (this diversion from the original is like taking a fork in the road) or contributing back your changes (such as bug fixes or new features) to the original project.", + "When you {/str/}fork{/str_e/} a repository, you create a copy of it on your GitHub account. Your forked copy begins its own life as a {/str/}remote{/str_e/} repository. Forks are used for creating your own version of a project and - if desired - for contributing your changes back to the original project (such as bug fixes or new features).": "When you {/str/}fork{/str_e/} a repository, you create a copy of it on your GitHub account. Your forked copy begins its own life as a {/str/}remote{/str_e/} repository. Forks are used for creating your own version of a project and - if desired - for contributing your changes back to the original project (such as bug fixes or new features).", "To get a forked repository from your GitHub account onto your computer you {/str/}clone{/str_e/} it. This cloning action copies the remote repository onto your computer so that you can work on it locally.": "To get a forked repository from your GitHub account onto your computer you {/str/}clone{/str_e/} it. This cloning action copies the remote repository onto your computer so that you can work on it locally.", + "By {/str/}forking{/str_e/} a foreign repository, you create a copy of the project as a new {/str/}remote{/str_e/} repository on your own GitHub Account. After {/str/}cloning{/str_e/} this new repository to your computer, you can work on it, {/str/}push{/str_e/} your changes to the server and even {/str/}pull{/str_e/} other peoples changes to your local copy. You can of course pull changes from the original repository too, but - as long as you don't have write-access - you can not push your changes there. We'll learn more on pulling later on.": "By {/str/}forking{/str_e/} a foreign repository, you create a copy of the project as a new {/str/}remote{/str_e/} repository on your own GitHub Account. After {/str/}cloning{/str_e/} this new repository to your computer, you can work on it, {/str/}push{/str_e/} your changes to the server and even {/str/}pull{/str_e/} other peoples changes to your local copy. You can of course pull changes from the original repository too, but - as long as you don't have write-access - you can not push your changes there. We'll learn more on pulling later on.", "Fork the Patchwork Repository": "Fork the Patchwork Repository", "The project we'll work with is at {/lnk_patchwork/}github.com/jlord/patchwork{/lnk_e/}. Go to that page and click the 'Fork' button at the top right. Once the forking animation is complete, you have a copy on your account. Copy your fork's HTTP URL from the address bar in your browser, this is the address of your fork on GitHub's servers.": "The project we'll work with is at {/lnk_patchwork/}github.com/jlord/patchwork{/lnk_e/}. Go to that page and click the 'Fork' button at the top right. Once the forking animation is complete, you have a copy on your account. Copy your fork's HTTP URL from the address bar in your browser, this is the address of your fork on GitHub's servers.", "Clone Your Fork Locally": "Clone Your Fork Locally", diff --git a/resources/i18n/en-US/ch07.json b/resources/i18n/en-US/ch07.json index 1bba7c15..ea4bd5fe 100644 --- a/resources/i18n/en-US/ch07.json +++ b/resources/i18n/en-US/ch07.json @@ -2,7 +2,7 @@ "Add a branch, locally, to your forked repository to work on your changes.": "Add a branch, locally, to your forked repository to work on your changes.", "Branches": "Branches", "Git repositories use branches to isolate work when needed. It's common practice when working on a project or with others on a project to create a {/str/}branch{/str_e/} to keep your working changes in. This way you can do your work while the main, commonly named 'master', branch stays stable. When the work on your branch is finished you merge it back into the 'master' master branch.": "Git repositories use branches to isolate work when needed. It's common practice when working on a project or with others on a project to create a {/str/}branch{/str_e/} to keep your working changes in. This way you can do your work while the main, commonly named 'master', branch stays stable. When the work on your branch is finished you merge it back into the 'master' master branch.", - "The diagram below shows how you can branch off of your 'master' branch, do work and then merge those changes back into 'master'. You can even branch off of a branch if you need to, the 'master' branch doesn't have to be the base.": "The diagram below shows how you can branch off of your 'master' branch, do work and then merge those changes back into 'master'. You can even branch off of a branch if you need to, the 'master' branch doesn't have to be the base.", + "The diagram illustrates how you can branch off of your 'master' branch (the straight black line in the middle), do your work on a branch (dots illustrate commits) and then merge those changes back into 'master'. You can even branch off of a branch if you need to, the 'master' branch doesn't have to be the base.": "The diagram illustrates how you can branch off of your 'master' branch (the straight black line in the middle), do your work on a branch (dots illustrate commits) and then merge those changes back into 'master'. You can even branch off of a branch if you need to, the 'master' branch doesn't have to be the base.", "For a great visualization on how branches work in a project, see this GitHub Guide: {/lnk_guide/}guides.github.com/overviews/flow{/lnk_e/}": "For a great visualization on how branches work in a project, see this GitHub Guide: {/lnk_guide/}guides.github.com/overviews/flow{/lnk_e/}", "GitHub Pages": "GitHub Pages", "GitHub will automatically serve and host static website files in branches named 'gh-pages'. This free service is called {/lnk_pages/}GitHub Pages{/lnk_e/}. Since the project you forked creates a website, its main branch is named 'gh-pages' instead of 'master'. All repositories that have a 'gh-pages' branch with website files can be found, live online, using this pattern for the URL:": "GitHub will automatically serve and host static website files in branches named 'gh-pages'. This free service is called {/lnk_pages/}GitHub Pages{/lnk_e/}. Since the project you forked creates a website, its main branch is named 'gh-pages' instead of 'master'. All repositories that have a 'gh-pages' branch with website files can be found, live online, using this pattern for the URL:", diff --git a/resources/i18n/en-US/ch09.json b/resources/i18n/en-US/ch09.json index 54f896f8..c2236265 100644 --- a/resources/i18n/en-US/ch09.json +++ b/resources/i18n/en-US/ch09.json @@ -2,6 +2,7 @@ "Keep your file up to date by pulling in changes from collaborators.": "Keep your file up to date by pulling in changes from collaborators.", "Pulling from a Remote": "Pulling from a Remote", "If you're working on something with someone else you need to stay up to date with the latest changes. So you'll want to {/str/}pull{/str_e/} in any changes that may have been pushed to the central GitHub repository.": "If you're working on something with someone else you need to stay up to date with the latest changes. So you'll want to {/str/}pull{/str_e/} in any changes that may have been pushed to the central GitHub repository.", + "If someone else {/str/}pushed{/str_e/} changes to the {/str/}remote{/str_e/} repository (on GitHub), you might want to {/str/}pull{/str_e/} these changes into your {/str/}local{/str_e/} repository.": "If someone else {/str/}pushed{/str_e/} changes to the {/str/}remote{/str_e/} repository (on GitHub), you might want to {/str/}pull{/str_e/} these changes into your {/str/}local{/str_e/} repository.", "What has Reporobot been up to?": "What has Reporobot been up to?", "See if Reporobot has made any changes to your branch by pulling in any changes from the remote named 'origin' on GitHub:": "See if Reporobot has made any changes to your branch by pulling in any changes from the remote named 'origin' on GitHub:", "If nothing's changed, it will tell you 'Already up-to-date'. If there are changes, Git will merge those changes into your local version.": "If nothing's changed, it will tell you 'Already up-to-date'. If there are changes, Git will merge those changes into your local version.", diff --git a/resources/i18n/en-US/ch10.json b/resources/i18n/en-US/ch10.json index b7f3fb89..9b5bb5cb 100644 --- a/resources/i18n/en-US/ch10.json +++ b/resources/i18n/en-US/ch10.json @@ -2,9 +2,10 @@ "Submit a Pull Request to the original Patchwork repository.": "Submit a Pull Request to the original Patchwork repository.", "Pull Requests": "Pull Requests", "Often when you make changes and improvements to a project you've forked, you'll want to send those changes to the maintainer of the original and {/str/}request{/str_e/} that they {/str/}pull{/str_e/} those changes into the original so that everyone can benefit from the updates—that's a {/str/}pull request{/str_e/}.": "Often when you make changes and improvements to a project you've forked, you'll want to send those changes to the maintainer of the original and {/str/}request{/str_e/} that they {/str/}pull{/str_e/} those changes into the original so that everyone can benefit from the updates—that's a {/str/}pull request{/str_e/}.", - "We want to add you to the list of workshop finishers, so make a {/str/}pull request{/str_e/} to add your username file to the original: {/lnk_patchwork/}github.com/jlord/patchwork{/lnk_e/}.": "We want to add you to the list of workshop finishers, so make a {/str/}pull request{/str_e/} to add your username file to the original: {/lnk_patchwork/}github.com/jlord/patchwork{/lnk_e/}.", + "Two files, belonging to the original repository (the red one on the left) and your forked repository (the blue one on the right) respectively. If you want to integrate your changes into the original repository, you'll need to create a pull-request, asking the maintainers to pull your changes over.": "Two files, belonging to the original repository (the red one on the left) and your forked repository (the blue one on the right) respectively. If you want to integrate your changes into the original repository, you'll need to create a pull-request, asking the maintainers to pull your changes over.", "Create a pull request": "Create a pull request", - "Visit the original repository you forked on GitHub, in this case {/lnk_patchwork/}{/urlpatchwork/}{/lnk_e/}.": "Visit the original repository you forked on GitHub, in this case {/lnk_patchwork/}{/urlpatchwork/}{/lnk_e/}.", + "We want to add you to the list of workshop finishers, by creating a {/str/}pull request{/str_e/} to add your username file to the original repository.": "We want to add you to the list of workshop finishers, by creating a {/str/}pull request{/str_e/} to add your username file to the original repository.", + "Therefore now visit the original repository you forked on GitHub, in this case {/lnk_patchwork/}{/urlpatchwork/}{/lnk_e/}.": "Therefore now visit the original repository you forked on GitHub, in this case {/lnk_patchwork/}{/urlpatchwork/}{/lnk_e/}.", "Often GitHub will detect if you've pushed a branch to a fork and display it at the top of the original's website. If you see that with your 'add-username' branch, you can click to create a Pull Request from there. If not:": "Often GitHub will detect if you've pushed a branch to a fork and display it at the top of the original's website. If you see that with your 'add-username' branch, you can click to create a Pull Request from there. If not:", "Click the green 'New pull request' button.": "Click the green 'New pull request' button.", "Select the branch with the changes you want to submit. It should be the one with 'add-yourusername'.": "Select the branch with the changes you want to submit. It should be the one with 'add-yourusername'.",