Page Comparison

Getting set up

To get started sign up for an account on Bitbucket

Fork the main repository

Now you can clone your fork using the https or ssh protocol  e.g.

git clone https://YOUR_BB_USERNAME@bitbucket.org/YOUR_BB_USERNAME/librepilot.git

for https which is the easiest to set up.

Next add the main LibrePilot remote, you can use anything that makes sense instead of upstream, I simply use bb to keep the length down.

git remote add upstream https://bitbucket.org/librepilot/librepilot.git

Optional

You shouldn't need a next branch in your fork so:

git fetch upstream
git branch --set-upstream-to=upstream/next next 
git push origin --delete next

Get lasted

Get the latest from upstream

git fetch upstream

Create new branch

Now 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 changes

Make 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'

Commit

Now commit 'git commit'.
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

Rebase

Once 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 

Push your code

Now push it to your fork

git push -u origin HEAD