Differences

This shows you the differences between two versions of the page.

--- evergreen-docs:github-workflow [2018/02/06 10:36] – rjs7
+++ evergreen-docs:github-workflow [2018/12/06 12:34] – sandbergja
@@ Line 1: / Line 1: @@
 ====== Docs GitHub Workflow ======
-When someone [[evergreen-docs:how-to-contribute-documentation#beginner_workflow|submits a change via GitHub]], an Evergreen developer should follow these steps to review it:
+When someone [[evergreen-docs:how-to-contribute-documentation#intermediate_workflow|submits a change via GitHub]], an Evergreen developer should follow these steps to review it:
   - If you haven't yet, add the main Evergreen repo (on GitHub) as a remote
@@ Line 12: / Line 12: @@
     - ''git checkout [BRANCHNAME]''
   - Rebase the pull request branch to master, and handle any conflicts
-    - ''git rebase master''
+    - ''git rebase master'' -- note: if you are planning to squash multiple commits into a single commit, this is a good time to do it by running this command with the ''-i'' flag, i.e. ''git rebase -i master''
   - Test build the changed AsciiDoc file + the root*.adoc files that include it
     * ''asciidoc -a icons -a toc -d book -o OUTPUT_FILE ASCIIDOC_FILE''