Currently on my project, we are updating to react 17 and the testing library we use(enzyme to react testing library). In this process will we need to update multiple tests and files. However I don't want to do the upgrade in our main branch.
If I create a new branch that our team works off of - we won't be able to keep it updated with our main branch’s code(which we will continue to work on). That is not a viable solution, since that will lead to multiple merge conflicts and issues.
Another option is to update react/testing library on our main branch and ignore tests/files we need to get the app to work and build to pass. Then just work off of our main branch and update the code.
Ideally I would like:
- A separate branch that devs can merge into with upgrades
- The separate branch to be able to stay up to date with develop
- Merge branch when all work is complete
- Ability to work off main branch without upgrades
From my understanding there is no standard way of doing this. I looked into
git worktree and not sure if that does what I need. Any recommendations on the best way of accomplishing this?