> Therefore, this merge conflict can be resolved automatically by putting the li... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		1718627440 4 months ago \| parent \| context \| favorite \| on: Mergiraf: Syntax-Aware Merging for Git > Therefore, this merge conflict can be resolved automatically by putting the lines in any order. The resulting merged program has the same behavior either way. That means that if I the programmer care about the order, I must now review lines, where no merge conflict is indicated. I am not sure I would like that.

PoignardAzur 4 months ago [–]

Yeah, that's a bad example, there's a bunch of ways field order matters in Rust.

Import order would have been a better example (they're always supposed to be sorted).

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact