Tips for merging big changes between branches

Question

To find out Doxygen, I created a branch and modified the comments of the slow project source file. However, this project has changed a lot since then, splitting a large file into several small files:

big_file.c -> big_file.c file_a.[ch] file_b.[ch]

I want to do the same in my thread. Obviously, I can duplicate my big_file.c branch as file_a. [ch] etc. and combine manually, removing unnecessary parts. However, I was wondering if the ways to do this were less error prone.

Answer 1

It was a little, but I did a merge pretty quickly, if boring. For further use, the project followed two good practices:

• Frequent minor commits
• ,

, , (file_a. [ch], file_b. [ch]). . - big_file.c _a. [Ch]. , . , HEAD . .

Answer 2

git merge . , - .