create-non-conflicted-commit-v1
Change-Id: I42c26a97c40b38c3aa019101a3d2868821a5eb0c

new_view.view.lkml

diff --git a/new_view.view.lkml b/new_view.view.lkml
index 6d90434..535161e 100644
--- a/new_view.view.lkml
+++ b/new_view.view.lkml
@@ -1,5 +1,6 @@
 view: new_view {
 
 ## Adding something on line 3 - This is a new view
+## committing this via create-non-conflicted-commit-v1
 
 }