prudhvigodithi commented on issue #15421: URL: https://github.com/apache/lucene/issues/15421#issuecomment-3590380242
> Having the same file with different content on branches won't work for cherry picking commits (backporting), unfortunately. If everyone appends to the end of the file and it's kept per version (cleared after each release), IMO conflicts should be minimal. We can also explore strategies like `CHANGES.txt merge=union` to `.gitattributes`. -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
