adding something on line 27 and it will be overwritten in different branch to create merge conflicted Change-Id: I5d5ec6e6016992f82686a404bbef4702a0758bfc
diff --git a/rebase_testing_v4.model.lkml b/rebase_testing_v4.model.lkml index 5501cfd..ba13c50 100644 --- a/rebase_testing_v4.model.lkml +++ b/rebase_testing_v4.model.lkml
@@ -23,3 +23,5 @@ ## Adding something on model file via non-conflicted-commit-v1 + +## adding something on line 27 and it will be oeverwritten in different branch to create merge conflicted