Skip to content

Commit ffb14ab

Browse files
Update branch references from master to maintenance
Updated instructions to reflect the use of the maintenance branch instead of master for cloning and merging.
1 parent 5ee171f commit ffb14ab

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

docs/development/Development.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ The main flow for a contributing is as follows:
101101
1. Login to github, go to the INAV repository and press `fork`.
102102
2. Then using the command line/terminal on your computer: `git clone <url to YOUR fork>`
103103
3. `cd inav`
104-
4. `git checkout master`
104+
4. `git checkout maintenance-10.x`
105105
5. `git checkout -b my-new-code`
106106
6. Make changes
107107
7. `git add <files that have changed>`
@@ -114,13 +114,13 @@ The primary thing to remember is that separate pull requests should be created f
114114

115115
**Important:** Most contributions should target a maintenance branch, not `master`. See the branching section below for guidance on choosing the correct target branch.
116116

117-
Later, you can get the changes from the INAV repo into your `master` branch by adding INAV as a git remote and merging from it as follows:
117+
Later, you can get the changes from the INAV repo into your version branch by adding INAV as a git remote and merging from it as follows:
118118

119119
1. `git remote add upstream https://github.com/iNavFlight/inav.git`
120-
2. `git checkout master`
120+
2. `git checkout maintenance-10.x`
121121
3. `git fetch upstream`
122-
4. `git merge upstream/master`
123-
5. `git push origin master` is an optional step that will update your fork on github
122+
4. `git merge upstream/maintenance-10.x`
123+
5. `git push origin` is an optional step that will update your fork on github
124124

125125

126126
You can also perform the git commands using the git client inside Eclipse. Refer to the Eclipse git manual.

0 commit comments

Comments
 (0)