Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

branch support #3124

Closed
wants to merge 1 commit into from
Closed

branch support #3124

wants to merge 1 commit into from

Conversation

janfjohannes
Copy link
Contributor

@janfjohannes janfjohannes commented Sep 16, 2024 •
edited
Loading

No description provided.

@changeset-bot changeset-bot
Copy link

changeset-bot bot commented Sep 16, 2024 •
edited
Loading

🦋 Changeset detected

Latest commit: f115d96

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 4 packages
Name Type
@inlang/cli Major
@inlang/plugin-message-format Major
next-js-testapp Patch
@inlang/fink2 Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Sep 16, 2024 •
edited
Loading

🥷 Ninja i18n – 🛎️ Translations need to be updated

❗️ New errors in setup of project /sdk-importer/project.inlang found

ProjectSettingsInvalidError The project settings are invalid: Required property at /sourceLanguageTag
#### ❗️ New errors in setup of project `/example/project.inlang` found
ProjectSettingsInvalidError The project settings are invalid: Required property at /sourceLanguageTag

@janfjohannes janfjohannes changed the base branch from main to lix-integration September 16, 2024 16:19
@janfjohannes janfjohannes changed the base branch from lix-integration to main September 16, 2024 16:33
@janfjohannes janfjohannes changed the base branch from main to lix-integration September 16, 2024 16:33
@janfjohannes janfjohannes changed the base branch from lix-integration to main September 16, 2024 16:36
@janfjohannes janfjohannes changed the base branch from main to lix-integration September 16, 2024 16:37
@janfjohannes janfjohannes changed the base branch from lix-integration to main September 16, 2024 16:41
@janfjohannes janfjohannes changed the base branch from main to lix-integration September 16, 2024 16:41
@janfjohannes janfjohannes marked this pull request as draft September 16, 2024 16:47
@janfjohannes janfjohannes changed the base branch from lix-integration to main September 17, 2024 18:17
@janfjohannes janfjohannes changed the base branch from main to lix-integration September 17, 2024 18:19
@janfjohannes janfjohannes changed the base branch from lix-integration to main September 26, 2024 13:53
@janfjohannes janfjohannes changed the base branch from main to lix-integration September 26, 2024 16:37
@janfjohannes janfjohannes marked this pull request as ready for review September 26, 2024 16:37
@janfjohannes janfjohannes changed the base branch from lix-integration to main September 26, 2024 16:47
@janfjohannes janfjohannes changed the base branch from main to lix-integration September 26, 2024 16:47
martin-lysk
martin-lysk reviewed Sep 27, 2024
View reviewed changes
Copy link
Contributor

@martin-lysk martin-lysk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I focused on the new branch switch function first - will continue reviewing

lix/packages/sdk/src/branch/get-leaf-changes-diff.ts Outdated Show resolved Hide resolved
lix/packages/sdk/src/branch/branch.test.ts Outdated Show resolved Hide resolved
lix/packages/sdk/src/branch/get-leaf-changes-diff.ts Outdated Show resolved Hide resolved
lix/packages/sdk/src/branch/get-leaf-changes-diff.ts Outdated Show resolved Hide resolved
lix/packages/sdk/src/branch/get-leaf-changes-diff.ts Outdated Show resolved Hide resolved
lix/packages/sdk/src/branch/get-leaf-changes-diff.ts Show resolved Hide resolved
lix/packages/sdk/src/branch/get-leaf-changes-diff.ts Outdated Show resolved Hide resolved
lix/packages/sdk/src/branch/switch.ts Outdated Show resolved Hide resolved
lix/packages/sdk/src/branch/switch.ts Show resolved Hide resolved
martin-lysk
martin-lysk reviewed Sep 27, 2024
View reviewed changes
Copy link
Contributor

@martin-lysk martin-lysk left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

followup review - still WIP

lix/packages/sdk/src/database/createSchema.ts Outdated Show resolved Hide resolved
lix/packages/sdk/src/database/schema.ts Show resolved Hide resolved
lix/packages/sdk/src/file-handlers.ts Outdated Show resolved Hide resolved
samuelstroschein

This comment was marked as outdated.

Sign in to view

@janfjohannes janfjohannes changed the base branch from lix-integration to main October 2, 2024 07:39
@janfjohannes janfjohannes changed the base branch from main to lix-integration October 2, 2024 07:40
@janfjohannes janfjohannes changed the base branch from lix-integration to main October 2, 2024 07:41
@janfjohannes janfjohannes changed the base branch from main to lix-integration October 2, 2024 07:59
@janfjohannes janfjohannes changed the base branch from lix-integration to main October 2, 2024 09:01
@janfjohannes janfjohannes changed the base branch from main to lix-integration October 2, 2024 09:01
janfjohannes
janfjohannes commented Oct 2, 2024
View reviewed changes
lix/packages/sdk/src/query-utilities/get-lowest-common-ancestor.ts

if (!nextChange || !nextChange.parent_id) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@martin-lysk not sure why you added !nextChange.parent_id what happens if the root change is the common ancestor?

@janfjohannes janfjohannes changed the base branch from lix-integration to main October 2, 2024 15:33
@janfjohannes janfjohannes changed the base branch from main to lix-integration October 7, 2024 17:23
@github-actions github-actions bot locked and limited conversation to collaborators Nov 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lucidNTR lucidNTR lucidNTR left review comments

@samuelstroschein samuelstroschein samuelstroschein left review comments

@martin-lysk martin-lysk martin-lysk left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@janfjohannes @lucidNTR @samuelstroschein @martin-lysk