Get latestGet the latest from upstream
Create new branchNow start your branch, the LP-XX refers to the JIRA ticket you pick for your work: git checkout -b LP-XX_branch_name upstream/next |
Make changesMake some changes and 'git add files ', double check what you are committing 'git diff --cached' Before adding files, the files changed can be displayed using 'git status'
CommitNow commit using 'git commit ' command. Refer to the Jira id in the commit message: "LP_XX ...". This will ensure the commit is picked up by Jira and linked to the original issue. Probably add some more changes / commits
RebaseOnce you have finished working on the branch, you are now ready to push it to your fork but there is an extra step you should do to keep things tidy and up to date with the latest LibrePilot so there are no merge conflicts. git fetch upstream
git rebase --interactive upstream/next |
This gives you the chance to also amend/fixup/squash/reword/reorder any commits if you want. Rebasing can initially by daunting but it is an essential git skill so it is worth learning the ins and outs of it. Remember if you get into trouble you can always 'git rebase --abort' and ask for help. |
Push your codeNow push it to your fork
|