wsa at kernel.org
Wed Sep 30 21:47:19 BST 2020
> 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 that
> rebasing is not recommended if you have pushed changes to origin because of
> 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?
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 833 bytes
Desc: not available
More information about the sane-devel