I have BC3 Pro. I have the following source code files in three completely separate directories:
- A base directory (BASE) with the original of all the code.
- A directory (DELTA) with new changes that were made for a particular function.
- Another directory (LATEST) that contains the latest versions of the code, but does not contain any of the changes in DELTA.
What I want to do is merge all the changes in DELTA into LATEST. I understand that BC3 does not support direct three-way merging of directories, but is there a way that I could manually merge individual files? What I would like to do is to start with a BC3 diff between BASE and DELTA, then for each change I find there, open up the corresponding file in LATEST and do a three way merge into the LATEST version. Is there some way that I can do this? Can I create a BC3 macro of some kind that I could launch from the diff panel? I can see how to run the 3 way merge from the command line, but I would prefer to be able to do this from BC3 itself.
- A base directory (BASE) with the original of all the code.
- A directory (DELTA) with new changes that were made for a particular function.
- Another directory (LATEST) that contains the latest versions of the code, but does not contain any of the changes in DELTA.
What I want to do is merge all the changes in DELTA into LATEST. I understand that BC3 does not support direct three-way merging of directories, but is there a way that I could manually merge individual files? What I would like to do is to start with a BC3 diff between BASE and DELTA, then for each change I find there, open up the corresponding file in LATEST and do a three way merge into the LATEST version. Is there some way that I can do this? Can I create a BC3 macro of some kind that I could launch from the diff panel? I can see how to run the 3 way merge from the command line, but I would prefer to be able to do this from BC3 itself.
Comment