Independent set of makefile targets exist so that one can run whichever task is most suitable. It assumes that all the projects have been cloned in the same parent directory, i.e. sibling of this repository. The projects are mentioned in src/code.ts file. When a new minor or major branch is created the code.ts file should be updated. The order of release numbers is important.
Ensure that the src/code.ts "releases" section is up to date to reflect only those branches which should be considered for release / merging.
Remove any older invalid releases from there.
Six makefile targets are available. Typically one may use them in this order.
Check if all branches exist in the origin.
Create remote branches if it does not exist in the origin, from ancestor one level at a time for a specific project.
Command Params: projectName=<project_name>
Ex: projectName=avni-server
Check if you have any local changes. This is required if you want to create local branches, or otherwise.
Create local branches for all the projects, if it exists in the origin and not created locally
It checks in origin branches if the immediate ancestor has been merged.
It auto merges ancestor branch into the descendant one level at a time for a specific project.
Command Params: projectName=<project_name>
Ex: projectName=avni-server
During Auto-merge, if there are merge conflicts, then the response would contain information about files that are pending merge and a message asking for merge conflict resolution. At this point, pause the auto-merge operation by not moving to the next release version merge. Switch to the repository being merged and resolve the merge-conflicts and push them to origin. Then resume the auto-merge by inputing "Yes(y)" or otherwise to instruct next release merge action.