Release and Merge Question

posts: 15 Canada

I fixed a bug in the 'release_eta_carinea_rc1' branch and commited it back to this branch. Do I need to MERGE it into HEAD, or is this done by another process? If I do need to MERGE, what is the exact process?


posts: 8 Croatia
As far as I understand, you don't have to merge it with HEAD. People who work on releases will do that.

posts: 111 Taiwan

Davor is right, don't bother with merging, it messes all as indentation changed in some files, and all queries related changes has to be adapted to new adodb schema. Changes have to be ported manually, if you can commit on both branches it's much better for consistency. But merging sessions will be handled by experimented people if required.