fix: resolve merge conflict markers left on master#153
Merged
Conversation
Five files on master carried unresolved conflict markers (<<<<<<</=======/>>>>>>>) from the concurrent merges of feat/argus-trace and feat/spring-benchmark: - completions/argus.bash - argus-cli/src/main/resources/messages_en.properties - argus-cli/src/main/resources/messages_ko.properties - argus-cli/src/main/resources/messages_ja.properties - argus-cli/src/main/resources/messages_zh.properties Both sides contained valid command-registration entries that should coexist. Resolution: remove marker lines, keep both sides' keys. The bash completion command list was also extended to include 'cluster' (registered in ArgusCli but previously missing from completion). No behavior change beyond restoring correct i18n keys and completion list. Signed-off-by: rlaope <piyrw9754@gmail.com>
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.
Summary
Five files on master carried unresolved git conflict markers (
<<<<<<</=======/>>>>>>>) from the concurrent merges offeat/argus-traceandfeat/spring-benchmark.Affected:
completions/argus.bashargus-cli/src/main/resources/messages_en.propertiesargus-cli/src/main/resources/messages_ko.propertiesargus-cli/src/main/resources/messages_ja.propertiesargus-cli/src/main/resources/messages_zh.propertiesResolution
Both sides of every conflict held valid keys that should coexist (
trace+spring+benchmarkare all real commands registered inArgusCli). Marker lines were removed, both sides' content preserved.The bash completion command list was also extended to include
cluster(registered inArgusClibut previously missing from the completion list — a separate pre-existing gap that this PR cleans up while touching the same lines).Impact
Before:
.propertiesfiles fail to load cleanly past line 340, breaking i18n for all locales. Bash completion list silently stopped mid-line.After:
./gradlew :argus-cli:compileJavasucceeds,./gradlew :argus-cli:testpasses.Test plan
./gradlew :argus-cli:compileJava --rerun-tasks— BUILD SUCCESSFUL./gradlew :argus-cli:test— passesgrep -n '^<<<<<<<\|^=======\|^>>>>>>>' .on repo — no matchesUnblocks follow-up work on #150 (argus gcscore), #151 (argus gcwhy), #152 (argus alloc).