Problem
Research questions and friction points this paper is trying to address.
commit boundaries
version control
3-way diff
cognitive load
D-Diff: An Interactive Environment for Adjusting Commit Boundaries Based on an Editable 3-way Diff
🤖 AI Summary
为解决版本控制中调整提交边界的问题，提出D-Diff工具，通过可编辑的3-way diff显示和修改连续两次提交间的差异，提高了效率。
📝 Abstract
In version control, it is recommended that each commit include only changes related to one task. To follow this recommendation, developers may need to adjust commit boundaries, that is, to compare and modify the diffs between two consecutive commits. Existing tools either display only a single diff at a time, forcing developers to rely on their memory when comparing diffs, or display three files simultaneously without showing the two consecutive diffs, forcing developers to infer them; both increase their cognitive load and hamper the adjustment. As a first step toward supporting this process, we propose D-Diff, an interactive diff adjustment environment for two consecutive commits that each involve the same single file. Based on a 3-way diff display, D-Diff integrates the two diffs into a single compact view, which also provides a way to modify them. A within-subjects user study with 8 participants showed that D-Diff significantly outperforms a baseline tool in terms of efficiency, reducing the median adjustment time from 530 seconds to 230 seconds (approximately 57%). D-Diff also received a higher percentage of positive responses across all usability questionnaire items, while no statistically significant difference was found in accuracy.
Innovation
Methods, ideas, or system contributions that make the work stand out.
3-way diff
interactive environment
commit boundaries
cognitive load
🔎 Similar Papers
No similar papers found.
