Merging #7
Description
The functionality to merge two branches is currently absent in Statik. Additionally, there is a need to implement a conflict resolution mechanism to handle situations where conflicts arise during the merging process.
{{ message }}