first change
changes in my branch
New file created
Merge branch 'dev'
config file changed
Merge branch 'master' of https://github.com/shamikarora/HelloSDL
Testing -1
:q
:q
:Wq
:WQ
:q
:w
Q
q
:q
:p
:Q

:A
:Q
:q
QW
:wq

:
cd
c d:q
cd :q
::Q
:q
exit
:Q
:q
./
/.
/,
qw
wq
:q
q:
q
File deleted
Finally the code is building
Branch testing
merge conflicts resolved