[parted-devel] branch merge?

[Otavio Salvador]

David Cantrell <dcantrell at redhat.com> writes:

> Why do I see this in the ChangeLog for stable-1.8.x?
>
> commit 3281e2847dc0e460e71feabc1e477db114a79313
> Merge: 3e3eda0... 78a2b09...
> Author: Debarshi Ray <rishi at sunflower.(none)>
> Date:   Thu Mar 8 01:52:08 2007 +0530 
>
>     Merge branch 'master' of 
> git+ssh://rishi-guest@git.debian.org/git/parted/parted
>
>
> All of the changes we have in edge appear in stable now.  This needs to
> unhappen.

Not really, as I explained at IRC for you he did a small mistake when
pushing back his changes to us.

Debarshi,

When you do changes on a branch and want to sync it with a remote one,
you shouldn't use git pull. Instead do:

git fetch origin/master
git rebase origin/master

The merging should be use only when we're doing feature merging or
a foreign branch merge (like we'll do later from freebsd people).

-- 
        O T A V I O    S A L V A D O R
---------------------------------------------
 E-mail: otavio at debian.org      UIN: 5906116
 GNU/Linux User: 239058     GPG ID: 49A5F855
 Home Page: http://otavio.ossystems.com.br
---------------------------------------------
"Microsoft sells you Windows ... Linux gives
 you the whole house."