On Monday 29 March 2010 06:46:56 pm Ximin Luo wrote:
> Hi,
>
> xor, it looks like you cherry-picked saces' commits from his personal
> branch "saces" on top of Bombe's "identicon" branch, instead of on top of
> the old "master" branch. and for some reason the new "master" branch now
> points to this ("identicon" plus some of saces' commits).
I thought I had:
- used "git fetch git://bombe-repository-uri identicon" to get bombe's
identicon branch
- used "git merge identicon" to merge it to master
- used git fetch to get saces' branch (called saces aswell)
- used git cherrypick to cherrypick commits from saces' branch
My intention was to use the identicon branch directly from bombe instead of
importing it from saces own branch, for the sake of using it from where it
came from originally.
Unfortunately, this was my first complex git operation so it may very well be
screwed up....
Can someone help us how to fix this? I don't know :(
And I would like to know how I should have done it because the same operations
have to be done for Freetalk... there are bombe and saces branches there
aswell...
> This effectively cancels all the work on the master branch from feb 16 to
> feb 26. Was this intended? If you can't fix it I can, but I'll need to
> make some forced pushes.
No :(
Why does it? :(
> see diagram for a better explanation
>
> http://github.com/freenet/plugin-WoT-staging/network
>
> X
> _______________________________________________
> Devl mailing list
> Devl at freenetproject.org
> http://osprey.vm.bytemark.co.uk/cgi-bin/mailman/listinfo/devl
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
URL:
<https://emu.freenetproject.org/pipermail/devl/attachments/20100330/c72190f6/attachment.pgp>
