#@vito @Erik Sipsma I have a new merge

1 messages · Page 1 of 1 (latest)

south thunder
# 
<<<<<<< HEAD
    if mod.Deps != nil {
        if err := mod.validateTypeDef(ctx, def); err != nil {
            return nil, fmt.Errorf("failed to validate type def: %w", err)
        }
    }
    if mod.NameField != "" {
        def = def.Clone()
        modPath := mod.modulePath()
        if err := mod.namespaceTypeDef(ctx, modPath, def); err != nil {
            return nil, fmt.Errorf("failed to namespace type def: %w", err)
        }
    }

    mod.ObjectDefs = append(mod.ObjectDefs, def)
=======
>>>>>>> cb0e0232d (extend module types, too)
warm dew
#

that incoming commit sounds like something we no longer need since the pivot to Llm - I wonder if we should just squash all that first to make rebasing easier? is the commit history on llm valuable?

#

though, the change might still be there anyway, since we didn't go back and clean it all up afaik

south thunder
#

Yeah I've been tempted to squash before, but worried about losing valuable history

#

not sure what the right balance is

#

Also if possible want each contributor to be credited for their code at the end (force of habit)

#

@warm dew are you saying that conflict is on dead code? ie. code that we're not using, or straight up remove ilater in this history?

warm dew
#

well i think i wrote that commit so i give you permission to git rebase --skip 😛

#

yeah

south thunder
#

if so maybe we surgically squash

warm dew
#

that was when we added AsAgent to every type and needed that for module types

#

i don't think we removed it later, but it's plausible you can just skip it

#

also, sorry, the rebase is gonna be really annoying until my two PRs extracted from frontend-api are merged

#

I wonder if it would be easier to just merge main into llm instead of rebasing, and then once those are in main we'll do a big rebase

#

at least then you just deal with all the conflicts at once, instead of each and every commit (possibly redundantly)

south thunder
#

right, makes sense. Old school 🙂

#

So in that particular conflict, how should I resolve in the merge?

#

😭

$ git merge main
Auto-merging .dagger/engine.go
Auto-merging cmd/dagger/module_inspect.go
Auto-merging cmd/dagger/shell_commands.go
Auto-merging core/moddeps.go
Auto-merging core/module.go
Auto-merging core/schema/coremod.go
Auto-merging core/schema/module.go
Auto-merging core/telemetry.go
CONFLICT (content): Merge conflict in core/telemetry.go
Auto-merging dagql/idtui/golden_test.go
Auto-merging dagql/objects.go
Auto-merging dagql/server.go
Auto-merging docs/docs-graphql/schema.graphqls
CONFLICT (content): Merge conflict in docs/docs-graphql/schema.graphqls
Auto-merging docs/static/api/reference/index.html
CONFLICT (content): Merge conflict in docs/static/api/reference/index.html
Auto-merging engine/server/server.go
Auto-merging engine/server/session.go
Auto-merging go.mod
Auto-merging go.sum
Auto-merging sdk/elixir/lib/dagger/gen/client.ex
CONFLICT (content): Merge conflict in sdk/elixir/lib/dagger/gen/client.ex
Auto-merging sdk/go/dag/dag.gen.go
CONFLICT (content): Merge conflict in sdk/go/dag/dag.gen.go
Auto-merging sdk/go/dagger.gen.go
CONFLICT (content): Merge conflict in sdk/go/dagger.gen.go
Auto-merging sdk/php/generated/Client.php
CONFLICT (content): Merge conflict in sdk/php/generated/Client.php
Auto-merging sdk/python/src/dagger/client/gen.py
CONFLICT (content): Merge conflict in sdk/python/src/dagger/client/gen.py
Auto-merging sdk/rust/crates/dagger-sdk/src/gen.rs
CONFLICT (content): Merge conflict in sdk/rust/crates/dagger-sdk/src/gen.rs
Auto-merging sdk/typescript/src/api/client.gen.ts
CONFLICT (content): Merge conflict in sdk/typescript/src/api/client.gen.ts
Automatic merge failed; fix conflicts and then commit the result.
#

OK most of those are generated

warm dew
#

yeah that's surprisingly tame

#

only one real conflict right?

south thunder
#

I thnk so

#

sorry I have to join a call real quick

#

If you feel up to it, the merge is all yours 🙂 Otherwise I'll do it after my call

#

Want to get that sweet performance boost

past otter
#

(you'll need to update to the v0.16.0 cli to get the majority of the performance improvements, but release is in progress, so hopefully later today)

south thunder
#

Ah nice. You're saying CLI@main + engine@main don't get you the boost?

#

(we have users install both engine & CLI from the llm branch)

#

back. How to I re-generate?

# 
<<<<<<< HEAD
        case dagql.Object:
=======
        obj, isObj := res.(dagql.Object)
        if !isObj {
            // try again unwrapping it
            if wrapper, isWrapper := res.(dagql.Wrapper); isWrapper {
                obj, isObj = wrapper.Unwrap().(dagql.Object)
            }
        }
        if isObj {
>>>>>>> main
past otter
south thunder
#

I feel like it's best to let you do the merge @warm dew ... 😅 I feel like a monkey pressing buttons at random. It's not urgent though, don't drop what you're doing