We're trying to organize better our Pharo repositories with a friend,
adding properly named folders for the software part (what we call Apps/)
and for the documentation part (what we cal Docs/), as we feel that src/
is kinda generic for a source code repository as everything is source.
Anyway, while working on such renaming we created two different
repositories, with two different file formats Tonel and FileTree and he
continued to work on the last one, while I recreated the repository,
with our ad-hoc convention (Apps/Package) in Tonel. Now, despite we're
working in the same repository, he is working in a branch that contains
code exported in FileTree format, while I'm working in the Tonel one.
How can we migrate all the code to a single format? Seems that Tonel is
the one choose, as far as we have seen in the documentation.
Thanks in advance,
Have you tried merging everything back into to a single package in an image, then save that to Tonel?
Thanks, your advice point us to the solution. We revert the changes in
the image to the commit we wanted, filed out the changes as a .st file,
went back to the tip of the branch and filed in the changes back.
On 18/07/22 23:18, email@example.com wrote:
Have you tried merging everything back into to a single package in an
image, then save that to Tonel?