Re: Is there a policy for branches being merged or not

2024-04-30 Thread Julian Sikorski
Am 28.04.24 um 23:44 schrieb Kevin Kofler via devel: Julian Sikorski wrote: In this case defaulting to cherry-picking would be a safer bet. Branches unintentionally separated can be merged, but branches unintentionally merged cannot be unmerged. This is only true if you are talking about merge

Re: Is there a policy for branches being merged or not

2024-04-29 Thread Gary Buhrmaster
On Mon, Apr 29, 2024 at 11:35 AM Richard W.M. Jones wrote: > > On Sun, Apr 28, 2024 at 10:27:26AM +0200, Julian Sikorski wrote: > > > I know this is just a cosmetic issue, but choices made by the > > primary maintainers should be respected IMO. > > I agree in general, but sometimes if you're makin

Re: Is there a policy for branches being merged or not

2024-04-29 Thread Richard W.M. Jones
On Sun, Apr 28, 2024 at 10:27:26AM +0200, Julian Sikorski wrote: > Hello, > > is there a general recommendation regarding keeping git release > branches separate vs merged? I have been keeping mine separate. > Originally to avoid release and changelog conflicts when > cherry-picking, but I got use

Re: Is there a policy for branches being merged or not

2024-04-28 Thread Kevin Kofler via devel
Julian Sikorski wrote: > In this case defaulting to cherry-picking would be a safer bet. Branches > unintentionally separated can be merged, but branches unintentionally > merged cannot be unmerged. This is only true if you are talking about merge-commit merges. Not if we are keeping the branches

Re: Is there a policy for branches being merged or not

2024-04-28 Thread Julian Sikorski
Am 28.04.24 um 10:36 schrieb Peter Robinson: On Sun, 28 Apr 2024, 09:28 Julian Sikorski, > wrote: Hello, is there a general recommendation regarding keeping git release branches separate vs merged? I have been keeping mine separate. Originally to

Re: Is there a policy for branches being merged or not

2024-04-28 Thread Peter Robinson
On Sun, 28 Apr 2024, 09:28 Julian Sikorski, wrote: > Hello, > > is there a general recommendation regarding keeping git release branches > separate vs merged? I have been keeping mine separate. Originally to > avoid release and changelog conflicts when cherry-picking, but I got > used to it and k