Saving

In order to work together with all collaborators on the website saving your changes to the Git repository is necessary.
To understand the Git versioning it's important to know that there exist two versions of this repository.

💡 A local one only on your computer where you commit your changes.
💡 And a remote repository which is shared by all collaborators where the local commits are pushed to.

Save your changes

Follow these steps in the following order to save your changes:

• Open Terminal app
• Switch to your project folder with cd path/to/your/folder/felixwiedemann
• Run git status to see if there are file changes of you
• Run git add -A to add your changes for the following commit
• Run git commit -m "Short summary what you changed" to save your changes in the local repository
• Run git pull to update your local repository
  • If the Terminal says remote: Resolving deltas: 100% (x/x), completed with x local objects. there are no file conflicts and you can ignore the next line and skip to git push
  • If there appears a Terminal message that there is a merge conflict please contact your website admin
• Run git push to save your commit to the remote repository

That's it - your changes are saved 👏

➡️ You can continue with uploading your changes to the web server.