Hi guys,
We've got a good bit of work to do for ourselves at my job, and we're looking for good tools to do it. One of our products is based on BSD, and we started our own fork a while back, and our CVS repositories show a LOT of changes in that time. Meanwhile, the BSD project has moved on as well. We want to merge the OS changes back into our projects. That's a BIG job.
Can anybody suggest tools to help us with the code merge?
We've got a good bit of work to do for ourselves at my job, and we're looking for good tools to do it. One of our products is based on BSD, and we started our own fork a while back, and our CVS repositories show a LOT of changes in that time. Meanwhile, the BSD project has moved on as well. We want to merge the OS changes back into our projects. That's a BIG job.
Can anybody suggest tools to help us with the code merge?
Comment