[oll-user] FInal stroke on repo merging

[Urs L. <ul...@op...>]

Hi,

sorry for the amount of noise lately. But it seems I need writing emails 
to get the idea afterwards myself ;-)

I think I found the solution to make the mess manageable without 
spending dozens of hours of work.

I applied a strategy that was described here 
<https://sandofsky.com/blog/git-workflow.html> quite spot on as 
"declaring branch bankrupcy". Through 'git commit --squash' I created 
one big commit with the difference of the initial empty state to the 
current working tree. This is rather clean because it just skips all 
deviations, dead ends etc. and records the current working tree as if it 
were imported from another location by file operations.
Conceptually this purges _any_ history, but I did something I found 
clever: I created a tag at the HEAD of the old master branch before 
deleting the old branches. Now all history is still there - in all its 
messiness - but out of sight in the (branch-free) tag archive/oldmaster. 
So it doesn't disturb the history graph anymore but is readily available 
for inspection through 'git checkout archive/oldmaster'.

I removed the temporary repositories from SourceForge and pushed my 
updated repo to the original place 
https://sourceforge.net/p/openlilylib/code/
In the root dir you'll find a file README-branching.md with my thoughts 
on a branching strategy. Please have a look at it and tell me if that's 
realistic.

Best
Urs
-------------- next part --------------
An HTML attachment was scrubbed...