Some more docs for bts-link

[Sandro Tosi]

Hi Olivier,

On Tue, Feb 3, 2009 at 11:27, Olivier Berger
<olivier.berger at it-sudparis.eu> wrote:
> Le lundi 02 février 2009 à 23:25 +0100, Sandro Tosi a écrit :
>
>> I did the best I could to not reject it another time, but when I came
>> to the 12th patch and I had to resolve another rebase conflics I gave
>> up. :(
>>
>
> Sorry for all the mess.

No problem :)

> This time I've started to rebase my branch on the master version, so you
> should be able to merge the docs in a painless way.

well, not exactly ;)

> All you'd need to do is :
> git pull -v git://git.debian.org/users/olberger-guest/bts-link.git moredocs
>
> (It's there :
> http://git.debian.org/?p=users/olberger-guest/bts-link.git;a=shortlog;h=refs/heads/moredocs in any case)
>
> Hopefully, this applies without conflicts.

I still got some merge conflicts (due to the first 2 patch in the
series), so I preferred to:

morph at zion:~/deb/bts-link$ git-cherry-pick
59bec12b5f887a1fb26aba01b4a500c24fdf8df3
Finished one cherry-pick.
Created commit 1f22ac4: Squashed commit of moredocs as rebasing from
trunk has become nightmare
 11 files changed, 199 insertions(+), 16 deletions(-)
morph at zion:~/deb/bts-link$ git-cherry-pick
04b8e0f600f1235220c45d3526dd8205c4910717
Finished one cherry-pick.
Created commit d13ecbe: More docs
 1 files changed, 2 insertions(+), 1 deletions(-)
morph at zion:~/deb/bts-link$ git-cherry-pick
250b67ec7bd200aee49815f302c99b6397edc4f8
Finished one cherry-pick.
Created commit 42f33ab: more docs
 1 files changed, 3 insertions(+), 1 deletions(-)

that generates the same exact result of your branch.

> I hope it's a better starting point for next batch of changes.
>
> Sorry about all the mess... now I learned git checkout -m, git rebase
> and similar tricks, I guess I'll do only commits on proper branches.

The best approach seems to be:

# go to master branch
git checkout master
# create a new feature branch, based on master
git checkout -b <new branch>
<work work work>
# update to the current master, that must track the bts-link one
git checkout master
git pull
git checkout <new branch>
git rebase master
<fix conflicts, if any>
<publish your branch>

This workflow, allows to take your <new branch>, compare to master, and then

git checkout master
git merge <new branch>

with no pain.

Of course, thanks for your doc!!! :)

Cheers,
-- 
Sandro Tosi (aka morph, morpheus, matrixhasu)
My website: http://matrixhasu.altervista.org/
Me at Debian: http://wiki.debian.org/SandroTosi