FoodWorksMadison / sustain-care.org

initial repository for the Madison sustain-care.org effort
0 stars 0 forks source link

Draft "Contact Us" #33

Closed cmatta2 closed 4 years ago

cmatta2 commented 4 years ago

This is just a test for the projects

wrolson22 commented 4 years ago

This has been created on the SC google drive folder under "Contact Page." @DonG-D-MSN to review since he is the point of contact. Comments are listed on the page.

prestonaustin commented 4 years ago

So, the easiest way to handle review would be to check in the draft here in github, and request a review, as that's trackable in here. I'm happy to show how that works, just reach out. I'll make an example that proposes to close this issue.

prestonaustin commented 4 years ago

Here's how I created the above open pull request to close this issue with a deliverable, and assigned it to @cmatta2 for review:

ON THE MAIN SUSTAIN-CARE.ORG GITHUB PAGE, CREATE NEW FILE:

Screen Shot 2020-05-01 at 5 27 59 PM

THAT GETS YOU THIS, I ADDED A DIRECTORY AND THE FILE AT THE TOP, AND TOLD IT TO CREATE A NEW BRANCH WHICH HOLDS THIS PROPOSED WORK.

Screen Shot 2020-05-01 at 5 24 01 PM

THAT TAKES ME TO HERE, WHERE I CAN PROPOSE THIS WORK BE INCLUDED IN THE PROJECT, AND ASK FOR A REVIEWER TO ACCEPT/REJECT IT

Screen Shot 2020-05-01 at 5 24 40 PM

BECAUSE I SAID IT CLOSES #33 THE SYSTEM LINKS IT TO THE ISSUE, YOU CAN SEE THAT AFTER I OPEN THE PULL REQUEST, IN THE LOWER RIGHT COLUMN:

Screen Shot 2020-05-01 at 5 26 15 PM

IF THAT PR IS MERGED, THIS ISSUE WILL CLOSE ITSELF, IF THAT PR IS REJECTED FOR FURTHER WORK OR DELETED WITHOUT MERGING IT, THIS PR WILL REMAIN OPEN.

prestonaustin commented 4 years ago

@cmatta2 - adding a comment to a closed issue here for you just to show how the fake review closed it out. You can reopen this issue if you want to still use it for a real contact us review that isn't done yet :)

IN RECEIPT OF YOUR FAKE REVIEW APPROVING MY CHANGES, I MERGED THEM TO MASTER AND CLOSED THE PR AND DELETED IT, WHICH CLOSED THE ISSUE ABOVE, LIKE SO...

OVER ON THE PR https://github.com/therabble/sustain-care.org/pull/40 I SEE YOUR APPROVAL AND SO I "MERGE PULL REQUEST" (I HAVE AUTHORITY TO DO THIS BECAUSE I'M A MAINTAINER, AS IS EVERYONE IN THE GROUP, BUT SOMEONE FROM ANOTHER GROUP COULD PROPOSE A PR FROM OUTSIDE AND WE COULD STILL DO THIS MERGE - THEY CANNOT)

Screen Shot 2020-05-02 at 5 22 06 PM

THEN I CONFIRM THE MERGE WITH A MERGE MESSAGE, THIS IS THE DEFAULT - I COULD ADD MORE ISSUES THIS CLOSES WITH "closes # <-number of an issue after # >" TYPE MESSAGES HERE.

Screen Shot 2020-05-02 at 5 21 23 PM

AFTER THE PR IS CLOSED, I HAVE THE OPTION TO DELETE THE BRANCH. I WOULD NOT DO THAT IF I THOUGHT MORE WORK WAS LIKELY ON THIS RIGHT AWAY, BUT IN MOST CASES DELETING BRANCHES IS THE WAY TO GO ONCE MERGED. THAT WAY YOUR NEW WORK IS BASED ON THE CURRENT MASTER NOT SOMETHING GETTING FURTHER OUT OF DATE WITH OTHERS' CHANGES.

Screen Shot 2020-05-02 at 5 22 49 PM

SO, HERE IT IS, PR MERGED AND BRANCH DELETED. FOR A WHILE THIS IS EASILY UNDONE, BUT AFTER MUCH ELSE HAPPENS UNDOING IT WOULD GET TRICKY IF NEW WORK DEPENDS ON THIS MERGED CHANGE.

Screen Shot 2020-05-02 at 5 22 35 PM