Re: [GNC-dev] Git branches

2022-11-15 Thread Geert Janssens
Op maandag 14 november 2022 19:59:24 CET schreef john: > I guess we could do that as long as we continue the no-backports policy, but > it's something you argued against when we started using git-flow a few > years ago. > I don't have a clear memory of what I argued against way back then. It does

Re: [GNC-dev] Git branches

2022-11-15 Thread john
I didn't follow completely all of dymitruk's essay either, but it seems clear to me that he's working in a much larger team than we are. His suggestion for handling merge conflicts was a shared git rerere cache; I understand the principle but I'm not completely clear about the implementation. I