You should regularly pull in updates from the repositories you're connected to.  This allows you to incorporate the latest fixes and features into your local development.

Official Updates

All official updates will be found on the master branch of the Insoshi repository at GitHub.

Cloning that repository automatically set up associations between your local master branch and ours.  All you need to do is run

  git checkout master
  git pull

Your local master branch will now be in sync.

Other Forked Repositories

If you've connected your local repository to other remote repositories such as the Insoshi forks on GitHub, you can pull in all the updates via

 git fetch <remote nickname>

If you've set up a local branch that tracks a branch on a remote repository, you can also run

  git checkout <tracking branch>
  git pull

The git pull performs a git fetch behind the scenes and merges the changes on to the tracking branch.

Incorporating Updates into Your Local Development

While you now have the updates in your local repository, they still need to be added to your local development branch.  This is accomplished by either rebasing or merging the commits on the updated remote (or local tracking) branches with your development.

We'll discuss the differences between rebase and merge in more detail in a later guide.  For now, we'll just assume that rebase is the correct operation which should be the case if your development is one top of a particular remote branch such as the official Insoshi master branch.

First make sure that you're in your development branch

  git checkout <localdev>

Issue the rebase command for the branch that your local development is starting from.  For the official Insoshi master, this would be

  git rebase master

All the changes you've made on your branch will be applied as if you started work originally from that new point on the master.

To reset your starting point of your development to another branch you would just use the appropriate branch name

  git rebase <another branch>

If you run into code merges that Git can't process automatically, you'll need to manually edit the files and let Git know you've completed those updates:

  git rebase --continue

Sometimes you might run into serious code merge conflicts or decide in the middle of the rebase that you didn't really want to perform the operation.  In either case, you can abort the rebase with

  git rebase --abort

[

In the case of serious merge conflicts during the rebase, you may need to perform a merge instead via

  git merge master

or

  git merge <another branch>

This is discussed in the Merge vs Rebase guide.

]