What should be the workflow, the order of using Update, Commit and Push for the development team?
Start of your workday: Update.
After having finished a relevant or all of your development:
And how to avoid situations when I can't do a Push because I have to download the commits of my colleagues?
You can avoid those situations by having a good team-alignment about who is working on what part of the application and thus prevent two persons working on the same documents. Or if they do: inform each other about the pushed changes.
Merge conflicts are not a bad thing. It just happens when you have a team working hard at the same codebase.
This is default action added to keep application updated with the latest version in Team Server (Repository).
It is right way to avoid Merge Conflicts before committing the new version.
Please refer to the Version Control Doc. for more details.
Are you using Team Server or different version control server like Git Hub. Currently we are working with Git server and here we have to commit our changes as well as other commits that happened before.
If there are previous commits that we didn’t update our app with and if we have changes we have to commit our code first and it won’t be pushed till we take update and resolve conflicts(if any) and commit again the updates
Also if we have changes locally, its not possible to update app before committing first