new_view.view.lkml

view: new_view {

## Adding something on line 3 - This is a new view
## adding something line 4 via new-branch_123 ==> Should be no merge conflict

}