local edit of abc.txt
remote update to abc.txt
newest update to abc.txt
Merge branch 'abc' of github.com:AndreiDev/Github-Flow into abc

Conflicts:
	abc.txt
added a new line
remote edit on new line
evolving new line
Merge branch 'abc' of github.com:AndreiDev/Github-Flow into abc

Conflicts:
	abc.txt