Hi
We are using release system in our company. When we did first release and merged the code to master through pull request it went through smoothly. But when we did second merge of the release there were conflicts because same files merged to master in previous release.
The solution we did to resolve it is to remove previous release commit in master and merge the latest release merge.
What is the correct approach to merge code from one release to another in master and when there are common files without deleting previous commit in master and not to merge manually in master when there is merge conflict
