0
I took a job where the staff has two versions.
I’ll explain better:
- One company A transferred a client to another company B, both of IT.
- Company A passed a version and the backlogs to company B.
- Company A made new implementations and Company B also.
I need to merge the two applications that are in a separate Gitlab: company A and company B, both with their modifications. And make "final" version to actually have company B updated version of both.
What’s the best way to do that? I’m a little lost in the process. I wanted to do it the right way, no tests because it’s the first time I’ve done it.
Well, one had committed and another came to the company and the previous developer didn’t commit to his version, so I was wrong about using Git. But the idea would be the same posted by @Fernando Silveira. What I used here was Meld (https://meldmerge.org/). It took work, but as it is modularized and by components was correct. Thank you staff.
– Ramos