On Fri, Nov 24, 2023 at 05:39:12PM +0100, Oliver Bandel wrote: > Hello, > > I'm adressing the problem with files separated from the main branch(es), > which currently might be (more or less) solved with either submodules or subtrees. > I want to suggest a new command here. > > As usecase-example I assume a project that has 'branch_a' and 'branch_b' > with some files may be identical, some different between them. > I assume that the (classical) way the files are handled > by belonging to those branches is intended. > > Then say later I want to add more files to these branches, > but don't want to commit them in either of these existing branches. > Instead a branch 'branch_addons' is created, which solely contains > files that are used in 'branch_a' as well as 'branch_b'. Now you can merge branch_addons onto branch_a and branch_b and be done. Unfortunately, git does not provide 'theirs' merge strategy while 'ours' is provided - somewhat asymmetrical. Thanks Michal
