Pr branch and rebasing notes for aura

Create a fork by going to https://github.com/aurajs/aura and forking.

Add your remote:

git remote add <yourusername> [email protected]:<yourusername>/aura.git

Add the upstream / main repository:

git remote add upstream git://github.com/aurajs/aura.git

git fetch upstream to get the latest commits

git log to find the latest hash

git rebase -i <hash> against the latest commit.

This will open an editor. You can pick a single commit and change the others you wish to squash.

After saving, git will check for any conflicts that need to be fixed by hand.

git status will show uncommitted files which must be fixed. Normally this is going to be between >>>. Fix the code to where it should be at present. Save it. git add <file> to add it to the rebase. git rebase --continue.

When this process is done, you may push it to your branch / PR.

git push --force <yourrepo> master

if in detached head state, git push --force tony HEAD:start-options.