Should we use branches?

Lawrence Paulson lp15 at cam.ac.uk
Fri May 16 13:13:00 CEST 2025


Thanks for the correction regarding topics in hg. 

My impression is that developers do rebase daily in order to avoid merge issues. Of course, these rebase steps leave no trace in the commit history, and there are no visible merges either.

Larry

> On 16 May 2025, at 12:06, Fabian Huch <huch at in.tum.de> wrote:
> 
> The danger of such a model is that branches quickly become stale and a nightmare to rebase. In my experience this model only really works well if developers are well synchronized, so people work on largely distinct pieces of code, or everybody integrates their changes with the trunk frequently, e.g. once per day.
> The former doesn't really apply in this environment. The latter one can already do when appropriate, since we have a trunk-based model.
> Note that in hg, branches mean divergent lines of work that can't be re-based. What you describe here are topics in hg.
> 



More information about the isabelle-dev mailing list