Some more docs for bts-link

[Sandro Tosi]

On Mon, Feb 2, 2009 at 10:57, Olivier Berger
<olivier.berger at it-sudparis.eu> wrote:
> Done, on
> http://git.debian.org/?p=users/olberger-guest/bts-link.git;a=summary (no
> branch anymore, as I suppose it's ok for a merge now).
>
> Hope I did improve my git-ing ;)

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. :(

Now, let's try this way: you should have an origin like this:

$ git remote show origin
* remote origin
  URL: git+ssh://git.debian.org/git/bts-link/bts-link.git
  Remote branch merged with 'git pull' while on branch master
    master
  Tracked remote branches
    master use-btsclient

or something else to track the "real" master branch of the project
(master has to be a local branch, so if it's not in origin, then add
git+ssh://git.debian.org/git/bts-link/bts-link.git as another remote,
let's call it X, then exec "git branch master X/master" and it will
track the "canonical" master in the local master branhc)

Now, checkout the branch you want to be merged on the master, and
issue a "git rebase master". Please resolve each conflict.

My best suggestion is to start from scratch. There is so much cruft on
the branch you're working on that it create more problems that it
solves. The final diff seems fine, but a branch must rebase on master
with no conflicts. I tried to resolve them, but they are too many and
due to patches over patches that revert other patches that fix other
patches :)

If this can help you, you can find me on IRC, I'm morph_ (or morph__
morph___) on irc.debian.org, this might lead to a fast resolution :)

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