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

conflict.conflicting_change_id -> conflict.change_b_id #114

Open
samuelstroschein opened this issue Oct 22, 2024 — with Linear · 0 comments
Open

conflict.conflicting_change_id -> conflict.change_b_id #114

samuelstroschein opened this issue Oct 22, 2024 — with Linear · 0 comments

Comments

@samuelstroschein Linear
Copy link
Member

Context

The conflict column names impose a meaning, which is wrong after LIXDK-126.

  • conflicting_change_id is the change that conflicts with change_id. After branching, both changes conflict with each other. There is no implication of which change conflicts with another one.

  • the column names have been decided before branching where conflicting change id did indeed have a special meaning

Proposal

Change the column names to conflict.change_a_id and conflict.change_b_id to remove meaning.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@samuelstroschein