[no subject]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Fatal: Need to specify how to reconcile divergent branches.
Hint: You have divergent branches and need to specify how to reconcile them.
Hint: You can do so by running one of the following commands sometime before
Hint: your next pull:
Hint:
Hint: git config pull.rebase false # merge
Hint: git config pull.rebase true # rebase
Hint: git config pull.ff only # fast-forward only
Hint:
Hint: You can replace "git config" with "git config --global" to set a default
Hint: preference for all repositories. You can also pass --rebase, --no-rebase,
Hint: or --ff-only on the command line to override the configured default per
Hint: invocation.

Perhaps I need to configure pull.rebase to be false?

> That's really it, there's not much else to it.
>
> Bart
>
> > > > Bart
> > >
> > > Gentle ping.
> > >
> > > Bart
> >
> >
> >
> > --
> > Luiz Augusto von Dentz



-- 
Luiz Augusto von Dentz

Prev by Date: Re: [GIT PULL] Immutable tag between the Bluetooth and pwrseq branches for v6.11-rc1
Next by Date: Re: [GIT PULL] Immutable tag between the Bluetooth and pwrseq branches for v6.11-rc1
Previous by thread: [PATCH v1] ARM: dts: rockchip: enable hdmi_sound and i2s0 for mk808 hdmi
Next by thread: [PATCH v3 0/4] media: rockchip: Add rkvdec2 driver
Index(es):
- Date
- Thread

[Index of Archives] [Device Tree Compilter] [Device Tree Spec] [Linux Driver Backports] [Video for Linux] [Linux USB Devel] [Linux PCI Devel] [Linux Audio Users] [Linux Kernel] [Linux SCSI] [XFree86] [Yosemite Backpacking]

Powered by Linux