DFFML Rolling Alice: Engineering Logs: Volume 0: Architecting Alice, 22 Jun 2022

Previous Meeting Next Meeting

⏯

youtube image

►

From YouTube: Architecting Alice: Volume 0: Documentation: Part 74: Rebase Resolution

Description

No description was provided for this meeting.
If this is YOUR meeting, an easy way to fix this is to add a description to your video, wherever mtngs.io found it (probably YouTube).

A

A

Let's get at it, so what are we doing right now? Well, we need to rebase in so ryan port builders warnings, open architecture, initial command given by zsh plan. Okay. So when did.

A

When was the last time we see a commit in here so march,.

A

February, how long has this branch been going? Add logo, okay,.

A

Okay, how about.

A

Okay, so ignore issues in get config, so let's do good status. I just pushed up another uh branch to dump discussion branch uh which, with the uh the dump from the last all right so all right.

A

Actually, we should do an updated dump of the discussion.

A

A

We have one with has next page.

A

A

Total count 51.

A

Just gonna, let us go over that number of nodes there we go, has next page, alright great, we got it all so.

A

All right, this is six uh 22.

A

622 yeah 9 52 a.m,.

A

A

Fine working tree files would be overwritten by checkout.

A

Okay, let's just do discussion dump two.

A

A

There we go okay, no more editing whatever that one is.

A

A

A

Okay, so we need to figure out how to get. We need to figure out how to roll all these patches.

A

Okay, ignore issues.

A

A

So we we re redid the whole main branch, um so.

A

Let's take a look at the difference between the main and the manifest branch. Okay. So let's do okay, so let's bring the manifest branch okay. So how do we bring the maintenance branch up to date across two different, uh unique branches? um Okay,.

A

A

A

Okay, so 235; okay, all right so give me taxes, okay,.

A

A

A

Okay, so we'll just remove that webi build all right. Okay, so we need to rebase in the changes from the manifest branch across the branches. So um what do we need to do so? We have two branches with different histories. We need to take. We need to do format patch, okay, so.

A

Okay, the pre-image merge; okay, okay, so pre-image merge; okay, so.

A

A

A

January, okay, we're gonna have a lot of these patches here. Okay, so.

A

Oh man, okay, so how we're gonna merge across trees.

A

Okay, so we have to rewrite right to format patch kid checkout manifest.

A

A

A

Master, okay, so just to see okay, so this so, let's make sure we're up to date, with this good rebase, three main master.

A

A

On branch, initial open source release, this can't be right.

A

Oh we're in upstream main, so let's go rebase.

A

A

Okay, wait a minute what happened here.

A

Okay, so manifest so this thing.

A

Good log pre-main manifest.

A

Okay, so let's see about the docs build.

A

Okay, we need to go slim down those ci jobs, okay, um okay, so.

A

How do we update all this manifest stuff.

A

Pre-Main master, okay,.

A

Upstream maine.

A

A

Her name made a mess, rename mastermind okay,.

A

Okay, this was a failure of an experiment to rename master domain so just to see project idea.

A

Okay, where's dfv.

A

This, let's undo this okay.

A

Okay, this is unbelievable. Okay,.

A

March 11th gsoc project idea: okay upstream main.

A

Remove web ui build okay, so good.

A

A

Pre-Made master docs rearrange. Why are these two histories different?

A

Why? What the are you kidding me why doc's rearrange? Where is that.

A

A

A

A

A

A

All right so get.

A

A

A

Man, please, please contribute.

A

Crepe ignore issues; okay, so.

A

I'm gonna do this off this, because this is not really us related. This is just me.