User Tools

Site Tools


evergreen-docs:github-workflow

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revisionBoth sides next revision
evergreen-docs:github-workflow [2018/02/06 10:40] rjs7evergreen-docs:github-workflow [2018/12/06 12:34] sandbergja
Line 12: Line 12:
     - ''git checkout [BRANCHNAME]''     - ''git checkout [BRANCHNAME]''
   - Rebase the pull request branch to master, and handle any conflicts   - 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   - 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''     * ''asciidoc -a icons -a toc -d book -o OUTPUT_FILE ASCIIDOC_FILE''
evergreen-docs/github-workflow.txt · Last modified: 2023/12/28 15:54 by aneiman

Except where otherwise noted, content on this wiki is licensed under the following license: CC Attribution-Share Alike 4.0 International
CC Attribution-Share Alike 4.0 International Donate Powered by PHP Valid HTML5 Valid CSS Driven by DokuWiki

© 2008-2022 GPLS and others. Evergreen is open source software, freely licensed under GNU GPLv2 or later.
The Evergreen Project is a U.S. 501(c)3 non-profit organization.