oblachno-oss/devx
Public Access
2
0
Fork 0
Code Issues 36 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

DEVX-31: Use branch name as sole task ID source #51

Closed
emil wants to merge 2 commits from DEVX-31-remove-taskid into master
pull from: DEVX-31-remove-taskid
merge into: :master
Conversation 2 Commits 2 Files Changed 6
+31 -35
emil commented 2026-06-24 11:01:00 +00:00
Owner
Copy Link
Copy Source

The .taskid file caused merge conflicts on every PR because master's .taskid always differs from the branch's. Branch names already contain the task ID (e.g., DEVX-31-fix-foo), so .taskid is redundant.

Changes:

  • read_taskid() now only extracts from branch name, ignoring .taskid
  • Remove Path import (no longer needed)
  • Fix release.py: strip heads/ prefix from git rev-parse output
  • Update translations and tests
  • Add .taskid to .gitignore (file stays on master but won't be re-added)

Closes DEVX-31

The .taskid file caused merge conflicts on every PR because master's .taskid always differs from the branch's. Branch names already contain the task ID (e.g., DEVX-31-fix-foo), so .taskid is redundant. Changes: - read_taskid() now only extracts from branch name, ignoring .taskid - Remove Path import (no longer needed) - Fix release.py: strip heads/ prefix from git rev-parse output - Update translations and tests - Add .taskid to .gitignore (file stays on master but won't be re-added) Closes DEVX-31
emil added 1 commit 2026-06-24 11:01:01 +00:00
fix: use branch name as sole task ID source, strip heads/ prefix in release
CI / detect-changes (pull_request) Successful in 29s
Details
CI / pr-review (pull_request) Successful in 35s
Details
CI / quality (pull_request) Successful in 1m15s
Details
CI / auto-merge (pull_request) Failing after 15s
Details
CI / release-dry-run (pull_request) Successful in 44s
Details
59589cd0a6 
The .taskid file caused merge conflicts on every PR because master's
.taskid always differs from the branch's. Branch names already contain
the task ID (e.g., DEVX-31-fix-foo), so .taskid is redundant.

read_taskid() now only extracts from branch name, ignoring .taskid.
Also fix release.py: some git versions return 'heads/master' instead
of 'master' from git rev-parse --abbrev-ref HEAD.

Closes DEVX-31
emil reviewed 2026-06-24 11:01:35 +00:00
emil left a comment
Author
Owner
Copy Link
Copy Source

Automated PR Review

  • Architecture compliance: OK
  • Best practices: OK
  • Security: OK
  • i18n: OK
  • Resource management: OK
  • Documentation: WARNING — source files changed but no docs updated
  • Tests: OK
  • Commit conventions: OK

No issues found by automated checks.

Auto-merge: If all CI checks pass, this PR will be merged automatically.

## Automated PR Review - Architecture compliance: OK - Best practices: OK - Security: OK - i18n: OK - Resource management: OK - Documentation: WARNING — source files changed but no docs updated - Tests: OK - Commit conventions: OK No issues found by automated checks. --- **Auto-merge:** If all CI checks pass, this PR will be merged automatically.
emil added 1 commit 2026-06-24 11:01:56 +00:00
chore: trigger recheck
CI / detect-changes (pull_request) Successful in 34s
Details
CI / pr-review (pull_request) Successful in 41s
Details
CI / quality (pull_request) Successful in 1m28s
Details
CI / auto-merge (pull_request) Failing after 9s
Details
CI / release-dry-run (pull_request) Successful in 37s
Details
6a43e63ce6
emil reviewed 2026-06-24 11:02:37 +00:00
emil left a comment
Author
Owner
Copy Link
Copy Source

Automated PR Review

  • Architecture compliance: OK
  • Best practices: OK
  • Security: OK
  • i18n: OK
  • Resource management: OK
  • Documentation: WARNING — source files changed but no docs updated
  • Tests: OK
  • Commit conventions: OK

No issues found by automated checks.

Auto-merge: If all CI checks pass, this PR will be merged automatically.

## Automated PR Review - Architecture compliance: OK - Best practices: OK - Security: OK - i18n: OK - Resource management: OK - Documentation: WARNING — source files changed but no docs updated - Tests: OK - Commit conventions: OK No issues found by automated checks. --- **Auto-merge:** If all CI checks pass, this PR will be merged automatically.
emil closed this pull request 2026-06-24 11:02:42 +00:00
emil reopened this pull request 2026-06-24 11:02:45 +00:00
emil closed this pull request 2026-06-24 11:03:16 +00:00

Pull request closed

This pull request cannot be reopened because the branch was deleted.
Sign in to join this conversation.
Reviewers
No Reviewers
emil
Labels
Clear labels
bug
Something is not working
 ci-improvement
CI workflow improvements
 doc-improvement
Documentation improvements
 feedback
Issues from subagent or agent feedback
 ready-to-merge
tooling
Tool-related feedback or improvements
 workflow-improvement
Workflow alignment or pattern improvements
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
emil (emil User) kireto
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: oblachno-oss/devx#51