Re: [B.A.T.M.A.N.] [RFC 1/6] batman-adv: Generalize DAT in order to support any type of data, not only IPv4

Antonio Quartulli
2013-09-11T06:46:21Z

[-- Attachment #1: Type: text/plain, Size: 697 bytes --]

On Wed, Sep 11, 2013 at 07:33:41AM +0300, Mihail Costea wrote:
> >
> > this is normal when you have multiple patches: if a fix in the very first patch
> > of a series creates conflicts with all the following ones, you have to adjust
> > them all (this is what the "git rebase" helps you with).
> >
>
> I haven't used it before but I will try it now.

git rebase is essential to make changes at a patch series. It helps you making a
change in an initial patch and propagate the change to the rest.
This may also be why you are experiencing much difficulty in doing this
operation.

Cheers,

--
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]