Talk:Jose Urra Log

Github-GitKraken

Hi Jose, I have a question about GitKraken, I wonder if 2 people make changes to a FreeCAD file in parallel, and then both push their changes to the master branch, is the master branch going to fuse the changes or will put up the last pushed file? I saw in tutorials that the changes are fused when people work in text projects, but I'm not sure about a CAD project. (Roberto)

Hey, Roberto, this is Emmanouil. Thats way I am pushing the constraint assemblies. Check the part library on the Power cube to see what I mean, I put the frame/tank already.Each one should make changes to one plate of a module. And then later a cad file that has ONLY imported parts is made. That makes the dxf export easier also, part list easier. We have to learn to break down the parts in Freecad in order to work efficiently Jose sorry for getting in the way! :) :)

I'd like to test your idea, could you share the repository?

Also, according to that workflow, where are we supposed to make the changes, in the constrained Frame module or in the separated Frame parts?(Roberto)

I do not think that works with non-text files. In that case it is best to coordinate the pull, so it is good to use branches. Ultimately, only one person can update the master branch at a time. In other words, the file update can not be done at once or automatically. Someone would have to do it as a last step. (Jose)