So what's the smoothest way these days to integrate localisation repositories into your git repo?

As a background: our localisation needs to live in a separate git repo that is monitored and also updated with new translations by pootle (a translation tool) but we also want to be able to pull out the generated PO files as well as push local updates (and new texts) from within the containing project repo the localisations belong to. So merges / rebates are kinda required.

Git submodules are the worst case here as you can't really commit / push local updates to the translations back to the localisation repo without making a separate checkout, doing your changes there, then pushing to your remote and finally updating the reference for your local submodule and pulling again.

Git subtrees sounded like a good idea but they way they're implemented makes them nasty to use as well.. they tend to break if you work with pull --rebase in the containing repo and merge conflicts in the sub tree can't be resolved with a sub tree-rebase either.

In the past I used to have the localisation as a full git checkout in a sub directory of the containing project and maintained it using a few CMake scripts but I had hoped there's be something smoother by now.

#git #submodules #subtree #localisation #i18 #workflows #question #SofwareDevelopment #boostswelcome

In #git is there any way to use a strategy like "-X theirs" when pulling a #subtree?

I'm encountering weird merge issues when pulling a subtree, and I'd like to be able to tell git just to force using the remote subtree source, rather than trying to merge theirs with what's currently in my top-level repo.

I've tried adding the `-X theirs` in various places within my `git subtree pull` command, and it just keeps telling me the syntax is incorrect.

Today I learned the usefulness of #git #subtree. It wasn't completely necessary, "git filter-branch" could achieve the same results by other means, but subtree just made it so much easier.

I've broken up my #COPR's cloud-native-utilities repo into their own distinct repos on #Pagure. The process was actually pretty straightfoward!

General overview since I'll run out of characters here:

https://paste.sr.ht/~omenos/46140c3432919c8dc74cb3fb255c67c5ed2b1a73

So this:

https://pagure.io/mroche/cloud-utilities

Has become:

https://pagure.io/group/mroche-cloud

TIL about git-subtree, which is a nice alternative to git modules (a source of much misery for me).

git-subtree lets you take one repository and merge it into another under a specified pathname (adjusting all the commits on the fly), OR take all the changes under a specified path (excluding parts that touched things outside of that path) and generating a set of commits which could be pushed into another repository.

https://manpages.debian.org/bullseye/git-man/git-subtree.1.en.html

#git #dvcs #til #subtree