When doing separate commits like that, it's essential to make sure that the lines match exactly (ie no extra spaces etc) otherwise it will cause problems later. Merging is much safer in general because it takes care of this.
General developer forum
List of files in 14_STABLE not merged to HEAD
This discussion has been locked because a year has elapsed since the last post. Please start a new discussion topic.