Importing a new upstream version

Change into your git repository, make sure it has all local modifications committed and run either of:

git-import-orig /path/to/package_0.2.orig.tar.gz
git-import-orig /path/to/package_0.2.tar.bz2
git-import-orig /path/to/package-0.2/
    
This puts the upstream souces onto the upstream branch. The result of this is then merged onto the master branch and a new changelog entry is created. You can again specify different branch names via the --upstream-branch and --debian-branch options. You can also filter out content you don't want imported:
git-import-orig --filter='CVS/*' /path/to/package_0.2.orig.tar.gz
    

If you expect a merge conflict you can delay the merge to master via the --no-merge and pull in the changes from the upstream branch any time later.