website icon indicating copy to clipboard operation
website copied to clipboard

Update Contributing.md With Improved Git Hygeniene Practices

Open kathrynsilvaconway opened this issue 3 years ago • 2 comments
trafficstars

Overview

We need our documentation for working on issues to be as up-to-date as possible and to reflect best practices for Git Hygiene, so all developers can create the same quality of code.

Action Items

  • [ ] In our Contribiuting.md, at the end of section 2.7.a,
    • [ ] add the following: IMPORTANT: Before you push your local commits to your repository, sync your fork to the main Hack For LA website repository. git pull upstream will ensure that your local repository is up-to-date with the main site:
git pull upstream

You can also sync your fork directly on GitHub by clicking "Sync Fork" at the right of the screen and then clicking "Update Branch"

  • [ ] Add a brief screen capture to demonstrate syncing the fork on GitHub.
  • [ ] Make the Following changes to section 2.7.d:
    • [ ] Change section title to read "Working on an issue (4): Pulling from upstream before you push"
    • [ ] Change everything above subsection "i" to the following:
IMPORTANT: Before you push your local commits to your repository, sync your fork to the main Hack For LA website repository. `git pull upstream` will ensure that your local repository is up-to-date with the main site:

```bash
git pull upstream
```
You can also sync your fork directly on GitHub by clicking "Sync Fork" at the right of the screen and then clicking "Update Branch"
  • [ ] Add a brief screen capture to demonstrate syncing the fork on GitHub.

Resources/Instructions

Contributing.md

kathrynsilvaconway avatar Aug 28 '22 02:08 kathrynsilvaconway

@kathrynsilvaconway I updated the overview to reflect the format required We need to do X for Y reason

As a developer, I need our documentation for working on issues to be as up-to-date as possible. For this issue, we will update the Contributing.md file to reflect best practices for Git Hygiene.

ExperimentsInHonesty avatar Sep 21 '22 16:09 ExperimentsInHonesty

@kathrynsilvaconway @7kram figured out that if you use four backticks to surround the three backticks, you can get a code block within a code block. Copying the code block above gives us:

IMPORTANT: Before you push your local commits to your repository, sync your fork to the main Hack For LA website repository. git pull upstream will ensure that your local repository is up-to-date with the main site:

git pull upstream

You can also sync your fork directly on GitHub by clicking "Sync Fork" at the right of the screen and then clicking "Update Branch"

Now that we have made this change and others, please re-review the issue

ExperimentsInHonesty avatar Sep 21 '22 17:09 ExperimentsInHonesty

Hi @MattPereira, thank you for taking up this issue! Hfla appreciates you :)

Do let fellow developers know about your:- i. Availability: (When are you available to work on the issue/answer questions other programmers might have about your issue?) ii. ETA: (When do you expect this issue to be completed?)

You're awesome!

P.S. - You may not take up another issue until this issue gets merged (or closed). Thanks again :)

github-actions[bot] avatar Oct 17 '22 19:10 github-actions[bot]

Availability: 1 PM - 3 PM ETA: End of Day 10/17/22

MattPereira avatar Oct 17 '22 20:10 MattPereira