[bknr-devel] Problems with XML import/export, can't follow the tutorial

[Hans Hübner]

Hi Frederico,

the rebase seems to have worked fine.  I reviewed your changes and
made a few very minor comments in github.  If you can take care of
them, I'll happily pull into my repository, thanks!

Cheers,
Hans

2010/5/28 Frederico Muñoz <fsmunoz at gmail.com>:
> Hi,
>
> Thank you for the assistance, as I said I'm new to git.
>
> 2010/5/28 Hans Hübner <hans.huebner at gmail.com>:
>> With your changes on your local master and the github master reset to the
>> old master, do a "git rebase -i origin/master". Squash all your commits into
>> one, save and push to github. That should do. Let us know if it does not.
>
> It worked, I only had to keep one of the changes as "pick", and the
> others as "squash".
> Rebased with master, then merged my wip branch with master, then
> pushed. I think it worked
> as expected, all changes are in one commit.
>
> Regards,
>
> Frederico
>