Repository navigation
test(tool): a line both the team and the template change is a marked conflict, exit code 2 - #115
Merged
Merged
Conversation
…her, are a marked conflict, exit code 2 - the team notes on the line busNeedsDatabase: false; dotskit new -S Orders --Messaging outbox turns that very line into true - the team edits HANGFIRE_DASHBOARD_PASSWORD in .env.example; the template's email block lands on the next line - both exit with 2, name the file, mark it <<<<<<< solution and keep the team's line and the template's - docs/getting-started/dotskit, EN and RU: git merge-file takes changes that touch for one place, so the table says so
Vovanda
force-pushed
the
test/dotskit-line-conflict
branch
from
October 6, 2026 17:41
a4a7145 to
e2ab10e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #102: the last check of its definition of done not yet covered by a scenario.
HANGFIRE_DASHBOARD_PASSWORDin.env.example;dotskit newadds a service with--Notify emailbeside it<<<<<<< solutionand keeps both the team's line and the template'sChecked by hand as well:
dotskit new -S Notifications --Notify email --Messaging outboxinto a solution of Orders builds with-warnaserror.🤖 Generated with Claude Code
https://claude.ai/code/session_01Vefp3uznXHA37YYMCkUouw