From fc8c75f9a7b113f8c94704e685ff648aa793592a Mon Sep 17 00:00:00 2001 From: Brian Lister Date: Sun, 18 Feb 2024 16:44:31 -0600 Subject: [PATCH 1/3] doc: add paragraph making more clear git workflow in this repo --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e432cb19852..96e8cfcd1d4 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ These exercises consist of a series of CSS-related tasks intended to complement When doing these exercises, please use all documentation and resources you need to accomplish them. You are _not_ intended to have any of this stuff memorized at this point. Check the docs, use Google, and do what you need to do (besides checking the solutions) to get them done. +We encourage you to practice your git skills by committing your changes and pushing them to your own fork. However, please **DO NOT** open a Pull Request to have your changes merged into the original repo. If we were to merge your changes the exercises would no longer be available for new learners, therefore opening a PR only causes additional work for us, as we have to close it without merging. + ## Contributing If you have suggestions to improve an exercise, ideas for a new exercise, or notice an issue with an exercise, please feel free to open an issue after thoroughly reading our [contributing guide](https://github.com/TheOdinProject/.github/blob/main/CONTRIBUTING.md). @@ -20,7 +22,6 @@ If you have suggestions to improve an exercise, ideas for a new exercise, or not 5. Once you successfully finish an exercise, check TOP's solution to compare it with yours. * You should not be checking the solution for an exercise until you finish it! * Keep in mind that TOP's solution is not the only solution. If your solution differs wildly from TOP's solution (and still passes the self-check criteria), feel free to ask about it in the chatroom. -6. Do not submit your solutions to this repo, as any PRs that do so will be closed without merging. ## Some Hints - The official solutions put all changes at the _end_ of the CSS file, which may duplicate some selectors (e.g. there might be a `body {}` in the given CSS and another `body {}` in the solution). When you are working on an exercise, it is best practice to add your CSS to existing selectors instead of duplicating them at the end of the file. We're sacrificing this best practice in our official solutions to make it extra clear to you what things we changed to solve the exercise. From e204d8b946be1b22b132eb2b6a2715acfbc203e7 Mon Sep 17 00:00:00 2001 From: Brian Lister Date: Sun, 18 Feb 2024 16:47:12 -0600 Subject: [PATCH 2/3] nit: add line in hot to back --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 96e8cfcd1d4..4297895d83b 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ If you have suggestions to improve an exercise, ideas for a new exercise, or not 5. Once you successfully finish an exercise, check TOP's solution to compare it with yours. * You should not be checking the solution for an exercise until you finish it! * Keep in mind that TOP's solution is not the only solution. If your solution differs wildly from TOP's solution (and still passes the self-check criteria), feel free to ask about it in the chatroom. +6. Do not submit your solutions to this repo, as any PRs that do so will be closed without merging. ## Some Hints - The official solutions put all changes at the _end_ of the CSS file, which may duplicate some selectors (e.g. there might be a `body {}` in the given CSS and another `body {}` in the solution). When you are working on an exercise, it is best practice to add your CSS to existing selectors instead of duplicating them at the end of the file. We're sacrificing this best practice in our official solutions to make it extra clear to you what things we changed to solve the exercise. From ba0cc689e8d9d3431b6b7c2ca99b653d6d8de7d5 Mon Sep 17 00:00:00 2001 From: Brian Lister Date: Sun, 25 Feb 2024 08:10:34 -0600 Subject: [PATCH 3/3] fix: update changes per discussion Co-authored-by: Eric Olkowski <70952936+thatblindgeye@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4297895d83b..67668a7bf7e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ These exercises consist of a series of CSS-related tasks intended to complement When doing these exercises, please use all documentation and resources you need to accomplish them. You are _not_ intended to have any of this stuff memorized at this point. Check the docs, use Google, and do what you need to do (besides checking the solutions) to get them done. -We encourage you to practice your git skills by committing your changes and pushing them to your own fork. However, please **DO NOT** open a Pull Request to have your changes merged into the original repo. If we were to merge your changes the exercises would no longer be available for new learners, therefore opening a PR only causes additional work for us, as we have to close it without merging. +We encourage you to practice your git skills by committing your changes and pushing them to your own fork. However, please **DO NOT** open a Pull Request to have your solutions merged into this repo or to show your solution. If we were to merge your changes the exercises would no longer be available as intended for new learners, and opening a PR only causes additional work for us, as we have to close it without merging. ## Contributing