Resolving Conflicts During Merge

During the process of releasing a new version of GRNsight, either to Master or Beta, there may be merge conflicts between the existing code in the branch and the new code attempting to be pushed. The following outlines the process of fixing these conflicts:

• Have a team member perform git pull on both the current beta branch as well as the branch attempting to merge into beta
• Manually edit files to resolve merge conflicts
• Test beta locally and continue to edit until conflicts are resolved
• Continue with Beta Release Instructions