I work without branches but with a large number of good tests, and it works like a charm. On the other hand, I know people who can spend several days to merge t

I work without branches but with a large number of good tests, and it works like a charm. On the other hand, I know people who can spend several days to merge their one week changes back to the master which is a great waste of time and really boring.