File size: 582 Bytes
ffbed00
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
---
language: en
tags:
  - code
  - git
  - merge-conflict
  - codet5
  - transformers
license: apache-2.0
---

# AutoMerge AI -CodeT5 Merge Conflict Resolver
This model is fine-tuned on Git merge conflict resolution data.
It takes conflicted code (base, ours(branch_A), theirs(branch_B)) and outputs the resolved version.

## Model
- Base: Salesforce/codet5-small
- Task : Merge Conflict Resolution

## Input Format
\<lbra> branch_a \<sep> base \<sep> branch_b \<rbra>

## Output
Resolved conflict sequence.

## Training Details
- Max conflict length: 500
- Max resolve length: 200