My point is there's no need to merge half-implemented code like this, either push something that works the way it's supposed to (in this case something that uses tags or lists ) or carry the incomplete testing/prototype code in your repository until it works properly.