OneSpace: Detecting cross-language clones by learning a common embedding space

M El Arnaoty, F Servant - Journal of Systems and Software, 2024 - Elsevier
Identifying clone code fragments across different languages can enhance the productivity of
software developers in several ways. However, the clone detection task is often studied in …

Understanding the Impact of Branch Edit Features for the Automatic Prediction of Merge Conflict Resolutions

W Aldndni, F Servant, N Meng - Proceedings of the 32nd IEEE/ACM …, 2024 - dl.acm.org
Developers regularly have to resolve merge conflicts, ie, two conflicting sets of changes to
the same files in different branches, which can be tedious and error-prone. To resolve …

Students Conflict Resolution Skills through Social Problem-Solving and Social Inquiry Models in Terms of Organization Experience

B Maftuh, E Syaodih… - Jurnal Iqra' …, 2023 - journal.iaimnumetrolampung.ac.id
This mixed-method research aims to determine the interaction between the learning process
using the two models and university students organizational experience on conflict …

WizardMerge--Save Us From Merging Without Any Clues

Q Zhang, J Li, J Lin, J Ding, L Lin, C Qian - arXiv preprint arXiv …, 2024 - arxiv.org
Modern software development necessitates efficient version-oriented collaboration among
developers. While Git is the most popular version control system, it generates unsatisfactory …

Supporting merge comprehension when resolving merge conflicts

N Nelson - 2024 - ir.library.oregonstate.edu
Distributed version control allows developers to manage software evolution among
distributed development teams. But it does not eliminate all consistency and concurrency …

[PDF][PDF] Conflict-based Change Awareness for Collaborative Model-driven Software Engineering

ABSTRACT Collaborative Model-driven Software Engineering (CoMDSE) involves multiple
engineers working together on modifying domainspecific models. This collaborative effort …