Skip to content

Commit

Permalink
Typo
Browse files Browse the repository at this point in the history
  • Loading branch information
DrDBanner committed Jan 30, 2022
1 parent 0b919a5 commit a234170
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion docs/install_and_contrib.rst
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ Configure Sublime Merge
Merging, Branching, and Commits
-------------------------------

Branches in Git are snapshots of your code repository at a given state. You can switch between them and/more merge code back and forth.
Branches in Git are snapshots of your code repository at a given state. You can switch between them and/or merge code back and forth.

With your initial cloning of your Academy as origin repository you're by default on the master branch. As soon as you checkout (switch) into a different branch all your files get modified according to its branch status. If you switch back, you're back on the initial code base.

Expand Down

0 comments on commit a234170

Please sign in to comment.