git add app.py
git commit -m "Add application file"
git push

Cannot merge
This branch has merge conflicts in the following files:
  • app.py

Sign up or log in to comment