control pkg.

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

control pkg.

Doug Stewart-4
Control package needs one more merge.

--
DASCertificate for 206392



-----------------------------------------
Join us March 12-15 at CERN near Geneva
Switzerland for OctConf 2018.  More info:
https://wiki.octave.org/OctConf_2018
-----------------------------------------
Reply | Threaded
Open this post in threaded view
|

Re: control pkg.

Olaf Till-2
On Wed, Feb 14, 2018 at 10:16:52AM -0500, Doug Stewart wrote:
> Control package needs one more merge.

I don't understand, what do you mean?

Olaf

--
public key id EAFE0591, e.g. on x-hkp://pool.sks-keyservers.net


-----------------------------------------
Join us March 12-15 at CERN near Geneva
Switzerland for OctConf 2018.  More info:
https://wiki.octave.org/OctConf_2018
-----------------------------------------

signature.asc (849 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: control pkg.

Doug Stewart-4


On Wed, Feb 14, 2018 at 4:39 PM, Olaf Till <[hidden email]> wrote:
On Wed, Feb 14, 2018 at 10:16:52AM -0500, Doug Stewart wrote:
> Control package needs one more merge.

I don't understand, what do you mean?

Olaf

-

I see two heads but if you don't then it is ok. I merged mine.
lsim and acker  were on one branch and merge Dougs changes was a different branch.

--
DASCertificate for 206392



-----------------------------------------
Join us March 12-15 at CERN near Geneva
Switzerland for OctConf 2018.  More info:
https://wiki.octave.org/OctConf_2018
-----------------------------------------
Reply | Threaded
Open this post in threaded view
|

Re: control pkg.

Olaf Till-2
On Wed, Feb 14, 2018 at 05:18:10PM -0500, Doug Stewart wrote:

> On Wed, Feb 14, 2018 at 4:39 PM, Olaf Till <[hidden email]> wrote:
>
> > On Wed, Feb 14, 2018 at 10:16:52AM -0500, Doug Stewart wrote:
> > > Control package needs one more merge.
> >
> > I don't understand, what do you mean?
> >
> > Olaf
> >
> > -
> >
>
> I see two heads but if you don't then it is ok. I merged mine.
> lsim and acker  were on one branch and merge Dougs changes was a different
> branch.
Ok. (But in case of a push, please take care not to push your local
branches... Maybe better to compare with a clean copy of the
repository.)

Olaf

--
public key id EAFE0591, e.g. on x-hkp://pool.sks-keyservers.net


-----------------------------------------
Join us March 12-15 at CERN near Geneva
Switzerland for OctConf 2018.  More info:
https://wiki.octave.org/OctConf_2018
-----------------------------------------

signature.asc (849 bytes) Download Attachment