Resolving NitroX Merge Conflicts
If your team is using NitroX, and more than one team member is working on the same project, creating the Test Steps and components it’s possible that you may encounter merge conflicts if use create the same FACT component. We would highly recommend that you commit often with small changes so that Git works in your favour rather than waiting to make your commit perfect, it’s better to work in small chunks and keep committing your work to minimise these issues occurring.
If you do encounter a merge conflict with NitroX we recommend you use the following steps to help you resolve the conflicts where two users have created the same component and encountered a merge conflict on the pull request. In this example, I’m merging the main branch into my feature branch change2.
Using a tool like Github, once the pull request is created and in conflict, select the Resolve Conflicts button on the pull request screen.
Above: Snapshot of Branch Conflict.
With NitroX, depending on the size of your commit and pull request you may only have 1 file affected, you may have multiple files but the key point to remember is that depending on the merging strategy you need to be consistent and consider the impact of the change decide to:
- Keep your branch’s changes: could this impact existing test
- Keep only the other branch’s changes: you’ll need to update your branch’s files
- Make a branch new change incorporating changes from both: consider the two previous two points.
Delete the conflict markers <<<<<<<, =======, >>>>>>> and make the changes you want in the final merge. In most cases, it’s advisable to Keep only the other branch’s changes and update your branch to prevent issues in files that aren’t in conflict. In the example below, I will accept the changes from main and update my files paying particular attention to the FACT component and Test Case files created.
In the following example, I have several conflicts and I’ve decided to keep the Keep only the other branch’s changes so I’ll manually remove the conflicts.
Above: Snapshot of Branch’s changes.
Once you’ve resolved all the conflicts in the file, click Mark as resolved.
Above: Snapshot of Resolved Conflicts.
If you have more than one merge conflict in your file, scroll down to the next set of conflict markers and repeat the previous steps to resolve your merge conflict.
Once you’ve resolved all your merge conflicts, click Commit merge. This merges the entire base branch into your feature branch.
Above: Snapshot of Commit merge.
Once the merge is confirmed, pull the latest changes from the remote branch and check your test is working as expected. Then commit your changes and merge to the main.
We understand that this could become quite complicated and we are working to enhance the product to improve this user experience and assist you in working with source control repositories.
To get a deeper understanding of NitroX, we recommend the following UP courses: