News for hackers. Stuff that matters.
Re:Show HN: An Agent That Resolves Merge Conflicts Automatic... by someguy101010 on Wednesday May 28, 2025 @10:17PM (#44122505)
Thanks but its not mine! I just found it inspirational.

> How does the agent know which to keep and which to discard for a conflict? This would that it has deep contextual information about the codebase it's looking at.

There is no guidance regarding this in the agent. For some conflicts this is important but I have found that for the conflicts I've tried this on it does not need the additional context to do the right thing! There is a option to add additional prompting before it solves a conflict. I will add notes in here to guide it such as "ignore auto generated files, i will generate them again later" so that it doesn't get stuck on generated data.

There are no comments on this comment yet.