Articles: Git.md #879
Articles: Git.md #879
Conversation
Also renames old files and updates the links Finished adding resources and updating filenames
|
LGTM 👍 |
| @@ -24,7 +24,7 @@ Ensure that you use markdown syntax for articles, we do not accept `HTML` or `CS | |||
|
|
|||
| **Commits and Squashing:** | |||
| - Your Pull Request/Submission should contain one single commit. | |||
| - For multiple commits follow the [guide to squash them](git-rebase#squashing-multiple-commits-into-one). | |||
| - For multiple commits follow the [guide to squash them](Git-Squash). | |||
There was a problem hiding this comment.
- [guide to squash them](Git-Squash)
+ [guide to squash them](https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/Git-Squash)That relative URL won't work but this will [guide to squash them](../Git-Squash) but it might conflict with the camperbot regex. Please confirm @Rafase282
There was a problem hiding this comment.
Why wouldn't the relative link work?
There was a problem hiding this comment.
@Rafase282 oops! I remember removing the comment right after making the comment. But seems like it didn't remove. Sorry!
The relative will work. 👍
|
For links, I would prefer something like this 👉 Practice Modern JavaScript README i.e. with Also see Airbnb Guide It has the benefit of perma links. 💯 |
| @@ -35,7 +37,7 @@ The repo will now look like this: | |||
| Do you see what happened? Git essentially saved the commits in the `auth` branch, 'removed' it, and then created it again with the same commits *after* the commits in the `dev` branch. This means that `Commit 4` only exists in the `dev` branch and not the `auth` branch! And that is really all there is to it! This might seem a bit confusing at first, but try to understand the diagram. This is an extremely useful tool. | |||
|
|
|||
|
|
|||
| ## git-rebase at FCC | |||
| ## Git-Rebase at FCC | |||
There was a problem hiding this comment.
Something like this would make a perma link
## <a id="fcc-git-rebase"></a>Git-Rebase at FCCwhich will render as...
Git-Rebase at FCC
and they can be referred to as
[**to the bottom**](#fcc-git-rebase) :point_down:which will render as...
to the bottom 👇
| pick commit_n | ||
| # Bunch of comments | ||
| ``` | ||
|
|
There was a problem hiding this comment.
Also add a line here suggesting to read the instructions given in the text editor at the bottom.
ghost
self-assigned this
|
|
||
| ``` | ||
| $ git --distributed-is-the-new-centralized | ||
| ``` |
There was a problem hiding this comment.
Please remove this completely.
```
$ git --distributed-is-the-new-centralized
```
| $ git --distributed-is-the-new-centralized | ||
| ``` | ||
|
|
||
| _Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency._ |
|
|
||
| _Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency._ | ||
|
|
||
| ## Resources |
There was a problem hiding this comment.
I think, this can be written as
Articles
instead of
Resources
- ## Resources
+ ## Articles
|
@Rafase282 File Rename - How-To-Create-A-Pull-Request-for-Free-Code-Camp.md
+ FCC-Pull-Request.md
|
| @@ -38,7 +38,7 @@ Next is to click on `Create Pull Request`. it is the green button and it will ta | |||
|
|
|||
| The first thing you will notice is the title with the pull request number, in the example it is `#393`. Next, is the status of the pull request, it will either be `Open`, `Closed` or `Merged`. | |||
|
|
|||
| You can click on the tabs to view the commits. Always try to have everything in one commit, or as few as possible if you have a good reason to have more than one commit. If you have multiple commits and need to **squash** them then follow these [instructions](https://github.com/freecodecamp/freecodecamp/wiki/git-rebase#squashing-multiple-commits-into-one). | |||
| You can click on the tabs to view the commits. Always try to have everything in one commit, or as few as possible if you have a good reason to have more than one commit. If you have multiple commits and need to **squash** them then follow these [instructions](https://github.com/freecodecamp/freecodecamp/wiki/Git-Squash). | |||
There was a problem hiding this comment.
- [instructions](https://github.com/freecodecamp/freecodecamp/wiki/Git-Squash)
+ [instructions](Git-Squash)
|
@Rafase282 My Review is Complete.
|
|
Suggestions implemented. |
|
@Rafase282 some of the suggestions are not yet complete, although completely unnecessary for how it renders but just for the sake of consistency. and what is your opinion about this 👉 #879 (comment) |
|
I already added the syntax highlight and I did add the line at the bottom but also added the sample squashing message so they see all the options that comes with it. With regard tot he links I didnt see somethign clear and i was short on time. Also we should stick to something because whatever we use, we will need to implement that on the generator and currently I think relative links is easier since they work ont eh regular wiki and are easier to handle as the file is the same and just the root url needs to be changed/added and that is something that needs to be fixed on the generator. |
| git checkout auth | ||
| git rebase dev | ||
| ``` |
There was a problem hiding this comment.
BONUS 💯 : Not related to this PR.
```sh $ git checkout auth $ git rebase dev ```
There was a problem hiding this comment.
Done.
Also
- # Git rebase
+ # Git Rebase
| If you contribute to the FCC codebase, or are planning to do it, always run this command before you make any changes in your local files and push them: | ||
|
|
||
| `git pull --rebase upstream staging` (thanks, @SaintPeter) |
There was a problem hiding this comment.
OPTIONAL : 💯 not related to this PR
- git pull --rebase upstream staging` (thanks, @SaintPeter) + git pull --rebase=preserve upstream staging`
There was a problem hiding this comment.
It says to run that before making any changes, so assuming that preserve is to keep your changes, that would not be needed I think.
👍 LGTMThanks for this one. 🎉 😃 Merging in 5 minutesIf anyone wants to STOP me, please comment.
|
* Rafase282/git: Updates git rebase Changes link to rebase article Creates main git article and links all resources
PR Merged 👍 |
Closes #875