daviftorres commented on PR #13671: URL: https://github.com/apache/cloudstack/pull/13671#issuecomment-5106601035
> @daviftorres you opened the same change to 4.20, 4.22 and main. We usually merge on the oldest branch and then merge forwards. In this way the fix has the some commit-id on all branches and it will be easier to track where a fix sits. Any merge conflict will have to be addressed, which you now did in advance. Thanks for that ;) but let’s stick to the 4.20 one and use the others only as documentation for conflict resolution. hey @DaanHoogland , my limited git stills felt whort on me. Feel free to close and make any changes you deem apropriated. Tks for letting me know. Next time I ask for help first. Regards, -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
