pfciah2fb
/
git_test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'main'
${ noResults }
git_test/1.txt

7 lines
56 B
Raw Permalink Normal View History Unescape

Merge branch 'branch1' # Conflicts: # 1.txt
8 months ago
<<<<<<< HEAD
text1
=======
111
8 months ago
test
Merge branch 'branch1' # Conflicts: # 1.txt
8 months ago
branch1
>>>>>>> branch1