add new file
Update iss.txt
change iss.txt
Update iss.txt
merged with remote
first patch commit
second patch commit
add line
merge with staged

Add new lines
add new file
Update iss23.txt
iss 23 file modified two times as new commit
commit 2
commit 3
change for conflict
ch 1
ch 2
commit file