{"id":19960041,"url":"https://github.com/thorsangervanet/git-task","last_synced_at":"2025-09-19T16:32:37.018Z","repository":{"id":65560302,"uuid":"582672556","full_name":"ThorsAngerVaNeT/git-task","owner":"ThorsAngerVaNeT","description":"Git Task for RS School. This task will train students in using some git commands that they are not using often.","archived":false,"fork":false,"pushed_at":"2023-02-16T12:08:22.000Z","size":97,"stargazers_count":7,"open_issues_count":0,"forks_count":2,"subscribers_count":1,"default_branch":"main","last_synced_at":"2024-11-13T01:53:28.961Z","etag":null,"topics":["git","rsschool-task"],"latest_commit_sha":null,"homepage":"","language":null,"has_issues":true,"has_wiki":null,"has_pages":null,"mirror_url":null,"source_name":null,"license":null,"status":null,"scm":"git","pull_requests_enabled":true,"icon_url":"https://github.com/ThorsAngerVaNeT.png","metadata":{"files":{"readme":"README.md","changelog":null,"contributing":null,"funding":null,"license":null,"code_of_conduct":null,"threat_model":null,"audit":null,"citation":null,"codeowners":null,"security":null,"support":null}},"created_at":"2022-12-27T14:40:30.000Z","updated_at":"2023-08-02T15:50:50.000Z","dependencies_parsed_at":"2023-02-15T23:15:28.476Z","dependency_job_id":null,"html_url":"https://github.com/ThorsAngerVaNeT/git-task","commit_stats":null,"previous_names":[],"tags_count":0,"template":false,"template_full_name":null,"repository_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/ThorsAngerVaNeT%2Fgit-task","tags_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/ThorsAngerVaNeT%2Fgit-task/tags","releases_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/ThorsAngerVaNeT%2Fgit-task/releases","manifests_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories/ThorsAngerVaNeT%2Fgit-task/manifests","owner_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners/ThorsAngerVaNeT","download_url":"https://codeload.github.com/ThorsAngerVaNeT/git-task/tar.gz/refs/heads/main","host":{"name":"GitHub","url":"https://github.com","kind":"github","repositories_count":233579582,"owners_count":18697327,"icon_url":"https://github.com/github.png","version":null,"created_at":"2022-05-30T11:31:42.601Z","updated_at":"2022-07-04T15:15:14.044Z","host_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub","repositories_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repositories","repository_names_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/repository_names","owners_url":"https://repos.ecosyste.ms/api/v1/hosts/GitHub/owners"}},"keywords":["git","rsschool-task"],"created_at":"2024-11-13T01:53:33.168Z","updated_at":"2025-09-19T16:32:31.699Z","avatar_url":"https://github.com/ThorsAngerVaNeT.png","language":null,"funding_links":[],"categories":[],"sub_categories":[],"readme":"# git-task\n\n⚠️ DO NOT SUBMIT PULL REQUESTS TO THIS REPO ⚠️\n\n---\n\n## Prerequisites\n1. Fork this repository with all branches: https://github.com/ThorsAngerVaNeT/git-task. Don't forget to uncheck `Copy the master branch only` checkbox.\n2. Clone your newly created repo: https://github.com/\u003c%your_github_username%\u003e/git-task/  \n3. Go to folder `git-task`\n4. Suggestion: set up VSCode as your Git editor - `git config --global core.editor \"code --wait\"`\n\n---\n\n## Submit to [RS App](https://app.rs.school)\n1. Create PR from **your** `develop` branch to **your** `main` branch, and ignore the message `Can’t automatically merge`\n2. Describe PR like [here](https://docs.app.rs.school/#/platform/pull-request-review-process?id=description-example)\n2. Open [RS App](https://app.rs.school) and login\n3. Go to `Cross-check: Submit` page\n4. Select your task (Git Task)\n5. Input link to your PR\n6. Press the submit button and enjoy\n\n---\n\n## General Task Description\nYou have a repository with multiple branches:  \n  - `main` - main branch of a repository with task requirements and description\n  - `develop` - branch that holds an actual state of our main page  \n  - `main-page-base` - branch that holds an initial design of the main page and already has been merged to the `develop` branch  \n  - multiple feature branches:\n    - `bullseye-game` - branch with 5 commits of Bullseye Game by Elliot Geno\n    - `cub-n-pup-game` - branch with 6 commits of Cub n Pup Game by Dave DeSandro\n    - `menja` - branch with 4 commits of Menja Game by Caleb Miller\n    - `link-new-style` - branch with 4 commits of the new style of the main page\n\nYour task is to manipulate branches and commits like it is described in [Task](#task).  \nResolving conflicts while merging/rebasing is a part of this task.  \n**The preferable way** of solving the task is by using Git CLI, but you could also use `Git Graph` and `Git Lense` VSCode extensions to visualize branches and so on.  \nThe deployed page should be like in [the demo](https://rss-git-task.netlify.app) and all games should work correctly too.\n\n---\n\n## Task \n1) `bullseye-game` branch  \n  1.1) Replace commit prefix `feat` with `docs` in `feat(bullseye): add license and readme` commit title.  \n  1.2) Split `feat(bullseye): add game` commit to 3 commits for each file (`index.html`, `style.css`, `script.js`). They should be in place of the old commit, which means commits should be in the following order (from the oldest to the newest): \n    ```\n    1. docs(bullseye): add license and readme\n    2. feat(bullseye): add index.html\n    3. feat(bullseye): add style.css\n    4. feat(bullseye): add script.js\n    5. feat(bullseye): add link to game in main page\n    6. feat(bullseye): add external dependencies as local files\n    7. feat(bullseye): update main page style\n    ```\n    The #2-4 commit titles could vary.  \n  1.3) Merge the `bullseye-game` branch into the `develop` branch with the creation of a merge commit.\n\n2) `cub-n-pup-game` branch  \n  2.1) Merge 3 commits (`feat(cub-n-pup): add index.html`, `feat(cub-n-pup): add script.js`, `feat(cub-n-pup): add style.css`) into 1 commit in place of them, commits should be in the following order (from the oldest to the newest):  \n    ```\n    1. docs(cub-n-pup): add license and readme\n    2. feat(cub-n-pup): add cub-n-pup game sources\n    3. feat(cub-n-pup): add link to game in main page\n    4. feat(cub-n-pup): update main page style - specify width\n    ```\n    The #2 commit title could vary.  \n  2.2) Merge **squashed** `cub-n-pup-game` branch to `develop` branch.\n\n3) `menja` branch  \n  3.1) Reorder commits of the branch to reverse order, commits should be in the following order (from the oldest to the newest):  \n    ```\n    1. docs(menja): add license and readme\n    2. feat(menja): add game files\n    3. feat(menja): add link to game in main page\n    4. feat(menja): update main page style - add text-align center\n    ```\n    3.2) Rebase `menja` branch into `develop`.\n  \n4) `link-new-style` branch  \n  4.1) Cherry-pick all commits from the `link-new-style` branch **with references to original commits** to `develop` branch.\n\n5) `develop` branch  \n  5.1) Set up deployment to GH Pages from the `develop` branch.\n\n---\n\n## Scoring\nMaximum - 45 points\n\n### Basic Scope\n- `bullseye-game` branch - **total 15 points**\n  - there is no `feat(bullseye): add license and readme` commit and there is `docs(bullseye): add license and readme` commit - **+5 points**\n  - there is no `feat(bullseye): add game` and there are 3 new commits in place of it for each file (`index.html`, `style.css`, `script.js`) - **+5 points**\n  - `bullseye-game` branch merged to `develop` branch with created merge commit - **+5 points**\n- `cub-n-pup-game` branch - **total 10 points**\n  - there are no `feat(cub-n-pup): add index.html`, `feat(cub-n-pup): add script.js`, `feat(cub-n-pup): add style.css` commits and there is a new commit contains them and placed in place of them - **+5 points**\n  - The **squashed** `cub-n-pup-game` branch was merged with to `develop` branch, there is a squashed commit - **+5 points**\n- `menja` branch - **total 10 points**\n  - there are 4 commits in the following order (from the oldest to the newest) - **+5 points**:\n    ```\n    1) `docs(menja): add license and readme`\n    2) `feat(menja): add game files`\n    3) `feat(menja): add link to game in main page`\n    4) `feat(menja): update main page style - add text-align center`\n    ```\n  - `menja` branch was rebased into `develop` branch - **+5 points**\n- `link-new-style` branch - **total 5 points**\n  - all commits were cherry-picked to the `develop` branch with references to original commits - **+5 points**\n- there is a deployment at GH Pages - **+5 points**\n\n### Penalties\n- there is a PR to the [original repository](https://github.com/ThorsAngerVaNeT/git-task) - -20 points\n- `bullseye-game` branch commits not in the order specified in Task 1.2 - -15 points\n- `cub-n-pup-game` branch commits not in the order specified in Task 2.1 - -10 points\n- `menja` branch commits not in the order specified in Task 3.1 - -10 points\n","project_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fthorsangervanet%2Fgit-task","html_url":"https://awesome.ecosyste.ms/projects/github.com%2Fthorsangervanet%2Fgit-task","lists_url":"https://awesome.ecosyste.ms/api/v1/projects/github.com%2Fthorsangervanet%2Fgit-task/lists"}