Closed KarolAntczak closed 6 years ago
You're exactly right. But I am a little worried about merge at once. What are some ways we can check it?
What are some ways we can check it?
You can just checkout 'peer-review' branch and test it.
I have already resolved all conflicts between this branch and 'master'.
I tested it myself (on VS 2017) and it should be ok.
Currently, both of these branches were used for releases. This may lead to confusion. Moreover, there are some fixes that exist in one branch only.
"Peer-review" should be treated as feature branch and, therefore, should be merged into "master" branch.