Question

I don’t know if what i’m trying to do makes sense but here is the explanation:

I have some source files that are generated by a tool and then changed a little and committed.
What happens is that sometimes I need to regenerate these files.

I need to do a manual merge of this new file with the one that was previously committed and pick which parts to take from the old version and which parts to take from the new version.

Is there a way to do this?

Thanks!

Answer 1

You can create a branch like “generated_files” what you never touch but when you generate your files.

In your “master” branch you can merge the branch “generated_files”.

Each time you generate new files you must commit it into the branch “generated_files” which will create a new delta from the previous generated version.

If you merge after this branch in “master”, this will apply only the delta from the previous version and keep your modification.

Maybe you can use a strategy during the merge to avoid conflict.