A Universal Textual Merge Strategy Based on Tokens for Version Control Systems

• URL: http://arxiv.org/abs/2604.13813v1
• Date: Wed, 15 Apr 2026 12:48:01 GMT
• Title: A Universal Textual Merge Strategy Based on Tokens for Version Control Systems
• Abstract summary: Merging is a core operation in version control systems such as Git, but traditional line-based algorithms often yield spurious conflicts.<n>We present Summer, a novel token-based merge algorithm independent of document formats.
• Score: 0.0
• License: http://creativecommons.org/licenses/by-nc-sa/4.0/
• Abstract: Merging is a core operation in version control systems such as Git, but traditional line-based algorithms often yield spurious conflicts, particularly in the presence of refactorings or parallel edits. While syntax- and semantics-aware merging approaches can reduce conflicts, they introduce drawbacks such as loss of formatting, dependence on language-specific parsers, and limited flexibility across heterogeneous artifacts. To address this gap, we present Summer, a novel textual token-based merge algorithm independent of document formats. Dividing text into tokens, our approach formulates token-level changes in one branch into string-rewriting rules and move rules, and applies these rules to the text of the other branch to construct a merge. Despite being independent on programming languages, our move rules model extracting and inlining functions. We evaluated Summer on ConflictBench, a large benchmark of real-world merge scenarios, comparing it with five pioneering merge tools across Java and non-Java files. Experimental results show that Summer achieved the highest 36% accuracy in reproducing merges verbatim identical to developers', and ranked second in semantic accuracy.

Related papers

• LLM-Enhanced Dual-Branch Learning for Large-Scale Multi-Label Text Classification [12.339719467095492]
  We propose DualMLC, a dual-branch framework that processes the same document through an autoregressive decoder-only language model and a bidirectional encoder.<n> DualMLC achieves state-of-the-art results on three widely used large-scale multi-label text classification benchmarks.
  arXiv  Detail & Related papers  (2026-09-11T14:42:16Z)
• SemaDiff: Identifying Semantic-Changing Commits with Generated Code and Tests [5.3138104073306005]
  Distinguishing semantic-preserving commits from changing ones remains an open challenge in software repository mining.<n>SemaDiff is a novel approach for identifying semantic-preserving commits through comparison of similar test execution on pre- and post-commit versions.<n>SemaDiff distinguishes accurately semantic-preserving from -- changing commits in about 76% of the cases, with a 100% precision in semantic-changing commit detection.
  arXiv  Detail & Related papers  (2026-07-14T12:23:22Z)
• On the Correctness of Software Merge [0.0]
  We present a new structural merge tool in comparison with existing tools based on the syntactic criteria we propose for evaluating the merge results.<n>Being parsable means that the result is syntactically valid according to the grammar of the programming language.<n>Being universal means that the result incorporates all and only the edit operations occurring in each branch while ensuring that edits common to both branches are applied only once.
  arXiv  Detail & Related papers  (2026-07-08T23:27:47Z)
• Token-to-Token Alignment of Text Embeddings for Semantic Blending [55.88554156801394]
  We introduce Token-to-Token alignment, a framework that establishes explicit semantic correspondence between tokens across prompts.<n>Our results show that text embedding spaces in text-to-image models implicitly encode a continuous semantic structure that becomes accessible once representations are properly aligned.
  arXiv  Detail & Related papers  (2026-06-22T23:54:40Z)
• AliMark: Enhancing Robustness of Sentence-Level Watermarking Against Text Paraphrasing [55.03371974830747]
  AliMark is a framework that reformulates sentence-level watermarking as a bit sequence encoding and alignment problem.<n>We show that AliMark substantially outperforms state-of-the-art baselines under diverse paraphrasing attacks.
  arXiv  Detail & Related papers  (2026-05-28T06:30:43Z)
• Utilizing Metadata for Better Retrieval-Augmented Generation [10.865886799087782]
  We present a systematic study of metadata-aware retrieval strategies.<n>We compare plain-text baselines with approaches that embed metadata directly.<n>We find that prefixing and unified embeddings consistently outperform plain-text baselines.
  arXiv  Detail & Related papers  (2026-01-17T01:11:03Z)
• Analyzing and Evaluating the Behavior of Git Diff and Merge [0.0]
  I document the main functionalities of Git: how diffs are computed, how they are used to run merges, and how merges enable more complex operations.<n>The default merge strategy (ort) can result in merges requiring exponential time in the number of commits in the history.<n>Sometimes when two sides of a merge add different lines at the same position, the result is not a conflict, but a merge containing both changes after each other, in arbitrary order.
  arXiv  Detail & Related papers  (2025-07-16T13:01:03Z)
• The Medium Is Not the Message: Deconfounding Document Embeddings via Linear Concept Erasure [98.71456610527598]
  Embedding-based similarity metrics can be influenced by spurious attributes like the text's source or language.<n>This paper shows that a debiasing algorithm that removes information about observed confounders from the encoder representations substantially reduces these biases at a minimal computational cost.
  arXiv  Detail & Related papers  (2025-07-01T23:17:12Z)
• Localizing Factual Inconsistencies in Attributable Text Generation [74.11403803488643]
  We introduce QASemConsistency, a new formalism for localizing factual inconsistencies in attributable text generation.<n>We show that QASemConsistency yields factual consistency scores that correlate well with human judgments.
  arXiv  Detail & Related papers  (2024-10-09T22:53:48Z)
• Text Editing as Imitation Game [33.418628166176234]
  We reformulate text editing as an imitation game using behavioral cloning. We introduce a dual decoders structure to parallel the decoding while retaining the dependencies between action tokens. Our model consistently outperforms the autoregressive baselines in terms of performance, efficiency, and robustness.
  arXiv  Detail & Related papers  (2022-10-21T22:07:04Z)
• Hierarchical Context Tagging for Utterance Rewriting [51.251400047377324]
  Methods that tag rather than linearly generate sequences have proven stronger in both in- and out-of-domain rewriting settings. We propose a hierarchical context tagger that mitigates this issue by predicting slotted rules. Experiments on several benchmarks show that HCT can outperform state-of-the-art rewriting systems by 2 BLEU points.
  arXiv  Detail & Related papers  (2022-06-22T17:09:34Z)
• MergeBERT: Program Merge Conflict Resolution via Neural Transformers [11.460182185916704]
  Merge conflicts can stall pull requests and continuous integration pipelines for hours to several days. We introduce MergeBERT, a novel neural program merge framework based on the token-level three-way differencing and a transformer model. Our model achieves 64--69% precision of merge resolution synthesis, yielding nearly a 2x performance improvement over existing structured and neural program merge tools.
  arXiv  Detail & Related papers  (2021-08-31T21:37:53Z)
• Logic Constrained Pointer Networks for Interpretable Textual Similarity [11.142649867439406]
  We introduce a novel pointer network based model with a sentinel gating function to align constituent chunks. We improve this base model with a loss function to equally penalize misalignments in both sentences, ensuring the alignments are bidirectional. The model achieves an F1 score of 97.73 and 96.32 on the benchmark SemEval datasets for the chunk alignment task.
  arXiv  Detail & Related papers  (2020-07-15T13:01:44Z)
• Extractive Summarization as Text Matching [123.09816729675838]
  This paper creates a paradigm shift with regard to the way we build neural extractive summarization systems. We formulate the extractive summarization task as a semantic text matching problem. We have driven the state-of-the-art extractive result on CNN/DailyMail to a new level (44.41 in ROUGE-1)
  arXiv  Detail & Related papers  (2020-04-19T08:27:57Z)

This list is automatically generated from the titles and abstracts of the papers in this site.

This site does not guarantee the quality of this site (including all information) and is not responsible for any consequences.