It was noted there was a lot of formatting noise in PR#20, analysis of the commit list showed a lot of this was due to commits that were made directly to the n4 branch upon which the code was based that were not reflected into n4-development.
It was feared that these code differences might result in merge conflicts later on if the pull request were directly based on n4-development instead of n4; however the code being a new feature, it was not appropriate for the code to be merged into n4 directly without some evaluation.
If we merge the current n4 branch into n4-development, that should reduce the noise seen in PR#20 and aide code review.
It was noted there was a lot of formatting noise in PR#20, analysis of the commit list showed a lot of this was due to commits that were made directly to the
n4branch upon which the code was based that were not reflected inton4-development.It was feared that these code differences might result in merge conflicts later on if the pull request were directly based on
n4-developmentinstead ofn4; however the code being a new feature, it was not appropriate for the code to be merged inton4directly without some evaluation.If we merge the current
n4branch inton4-development, that should reduce the noise seen in PR#20 and aide code review.