> Hi Andrea, > > Your last commit has conflicting merge. See <<<<<<<< lines in .tex > files. We have to deal with it manually. > I've made my changes based on your version. > I can sync our versions again based on your version. > No, don't merge my branch into yours. I could no longer sync your repository with a pull request on the web. I think I managed to do it with the terminal following your instructions (there was no "git fetch" to be able to continue). Now I'm in sync with you, but by opening "CinelerraGG_Manual.tex" I get a lot of errors and I don't compile the pdf. I've definitely made a mistake, but I don't know where. In any case your repository should be correct, the problem is mine (I think), so don't merge.
I try to make corrections manually, and then I'll let you know. -- Cin mailing list Cin@lists.cinelerra-gg.org https://lists.cinelerra-gg.org/mailman/listinfo/cin
