updated readme
Browse files
README.md
CHANGED
|
@@ -1,3 +1,28 @@
|
|
| 1 |
-
---
|
| 2 |
-
|
| 3 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
---
|
| 2 |
+
language: en
|
| 3 |
+
tags:
|
| 4 |
+
- code
|
| 5 |
+
- git
|
| 6 |
+
- merge-conflict
|
| 7 |
+
- codet5
|
| 8 |
+
- transformers
|
| 9 |
+
license: apache-2.0
|
| 10 |
+
---
|
| 11 |
+
|
| 12 |
+
# AutoMerge AI -CodeT5 Merge Conflict Resolver
|
| 13 |
+
This model is fine-tuned on Git merge conflict resolution data.
|
| 14 |
+
It takes conflicted code (base, ours(branch_A), theirs(branch_B)) and outputs the resolved version.
|
| 15 |
+
|
| 16 |
+
## Model
|
| 17 |
+
- Base: Salesforce/codet5-small
|
| 18 |
+
- Task : Merge Conflict Resolution
|
| 19 |
+
|
| 20 |
+
## Input Format
|
| 21 |
+
\<lbra> branch_a \<sep> base \<sep> branch_b \<rbra>
|
| 22 |
+
|
| 23 |
+
## Output
|
| 24 |
+
Resolved conflict sequence.
|
| 25 |
+
|
| 26 |
+
## Training Details
|
| 27 |
+
- Max conflict length: 500
|
| 28 |
+
- Max resolve length: 200
|