Merging
Merging
Posted May 14, 2008 18:38 UTC (Wed) by corbet (editor, #1)In reply to: Distributed bug tracking by iabervon
Parent article: Distributed bug tracking
In fact, the merging of comments works just fine, at least in Bugs Everywhere. Each comment is its own file, so there's no conflicts; they all just mix in together.
The problem is the "incompatible" changes - global stuff like severity, assigned-to, title, resolution status, etc. I don't think there will be any way to automatically merge changes to such parameters. What would be nice, though, is merging code which understands things at the right level rather than just forcing somebody to run an editor on its internal files to clean things up.
The LWN site is currently under high scraper load, so comment display has been suppressed for anonymous users. If you are a human, you may read the comments by clicking the button below:
Note: you can avoid this step in the future by logging into your LWN account.