skelband at gmail.com
Wed Sep 30 22:11:12 BST 2020
On Wed, Sep 30, 2020 at 1:47 PM Wolfram Sang <wsa at kernel.org> wrote:
> Hi Ralph,
> > I have an issue branch that now has conflicts with master.
> > I have not had a lot of experience with rebasing, but I read somewhere
> > rebasing is not recommended if you have pushed changes to origin because
> > the dangers of someone else working on the branch.
> I am still new to SANE, but from my Kernel experience:
> If you pushed a branch to the public and other people use the branch to
> work on top of that, then rebasing is indeed a bad idea. If not, then
> just rebase. Which branch is it?
> It is 264-canon-pixma-mx492-adf-issue.
AFAICS I am the only one to work on this branch, so I suspect that rebasing
will be OK.
Just really looking for perspectives for the SANE project.
I suspect different projects have views on this subject.
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the sane-devel