Simple 5 step Mercurial workflow

This simple workflow will make sure you always work with the most up to date version and will not cause any head conflicts when pushing your work into your repository.

Before you start coding runs these two commands
1. Get the current version from the repo

2. Make sure all files in your branch are updated

3. Make as many commits as possible over the course of your working day (or session).

4. At the end of the day (or session) start with the same two comannds at the beginning.

You get the current version from the repo and by using update you make sure all changes made by others in your team are now part of you code.

There may be conflicts with the files you worked on today. If that is the case each conflict should be resolved and another commit like in step 3 is neccessary.

5. Finally push your commits to the repository.

 

(170 Posts)

20 years of coding and working as software engineer but I am still eager to learn more. I am very passionate when it comes to open source, Linux and Java. But I made my peace with Windows long ago to fully enjoy my PC gaming hobby. I have a soft spot for 90s electronic music and Babylon 5. In the evenings you will find me roaming the endless space in Warframe (IGN k05h).