Stuck for 2.5 hrs...

codecommit
git

facing unable to push
keep commit everything
then pull
and face conflict
fix 1 by 1
then add fixed files into index, then commit and push again.