Re: [sane-devel] Rebase

2020-10-07 Thread Povilas Kanapickas
Hi Ralph, On 10/1/20 5:36 PM, Ralph Little wrote: > Hi, > > On 2020-10-01 4:39 a.m., Olaf Meeuwissen wrote: >> Hi Ralph, >> >> Ralph Little writes: >> >> AFAICS I am the only one to work on this branch, so I suspect that rebasing >> will be OK. >> I'd check with the pixma backend's new maintainer

Re: [sane-devel] Rebase

2020-10-04 Thread Ralph Little
Hi, On 2020-10-01 4:39 a.m., Olaf Meeuwissen wrote: > I'd check with the pixma backend's new maintainer, hi Povilas!, and > Louis just to make sure but what is the argument for not wanting to > merge master into your branch instead? > > BTW, I know for a fact that the old maintainer occasionally r

Re: [sane-devel] Rebase

2020-10-01 Thread Ralph Little
Hi, On 2020-10-01 4:39 a.m., Olaf Meeuwissen wrote: > Hi Ralph, > > Ralph Little writes: > > AFAICS I am the only one to work on this branch, so I suspect that rebasing > will be OK. > I'd check with the pixma backend's new maintainer, hi Povilas!, and > Louis just to make sure but what is the arg

Re: [sane-devel] Rebase

2020-10-01 Thread Olaf Meeuwissen
Hi Ralph, Ralph Little writes: > Hi, > > On Wed, Sep 30, 2020 at 1:47 PM Wolfram Sang 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 that >> > rebasing is not recommended if you

Re: [sane-devel] Rebase

2020-09-30 Thread Wolfram Sang
> AFAICS I am the only one to work on this branch, so I suspect that rebasing > will be OK. Yes. > Just really looking for perspectives for the SANE project. > I suspect different projects have views on this subject. IMHO only if they don't care about annoyed developers ;) signature.asc Desc

Re: [sane-devel] Rebase

2020-09-30 Thread Ralph Little
Hi, On Wed, Sep 30, 2020 at 1:47 PM Wolfram Sang 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 > that > > rebasing is not recommended if you have pushed changes to origin because > of

Re: [sane-devel] Rebase

2020-09-30 Thread Wolfram Sang
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 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-devel] Rebase

2020-09-30 Thread Ralph Little
Hi, 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 don't think that there is any