Skip to content

Commit

Permalink
added note to make merging PR optional
Browse files Browse the repository at this point in the history
  • Loading branch information
mthiel117 committed Aug 9, 2023
1 parent efa5b1b commit 263b704
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions workshops/git.md
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,12 @@ Once all changes have been agreed upon, the maintainer of the original repo will

This will generate a Pull Request on the main project repository **`aristanetworks/ci-workshops-fundamentals`**. The owner/maintainer can merge the pull request once all changes are satisfied.

### **Cleanup**
???+ note
During the workshop the PR is not normally merged to prevent having to reset the repo before the next workshop. The `Cleanup` section below is the normal course of action.

### **Cleanup** _(optional)_

After merging a Pull Request, you may cleanup your old branch.
After your Pull Request is merged, you may cleanup your old branch and sync your fork.

1. Delete your branch on GitHub and your local host.
2. Sync your Forked repo (below)
Expand Down

0 comments on commit 263b704

Please sign in to comment.