I have these two branches - "Order", "Dialogue"

Order came first, and I `git checkout -b Dialogue`, i did some work on this branch, i then pushed it up to the git in the cloud.

I then checked out back to "Order", I did a little bit of work on this - I want "Dialogue" to have these updates. Do I do this?

```
# git checkout Dialogue
# git merge -m "Pulled in some updates" Order

```

Then carry on making changes on "Dialogue", once everything is going well, merge it down to "Order".

```
# git checkout "Order"
# git merge -m "Pulled in from Dialogue" Dialogue

```

Now the main concern is that I use `Visual Studio` and every time you open and close a project it modifies the `.suo` file. So when I do a merge from `Order => Dialogue` its going to say it can't because the same file and line has been modified, obviously I want to take the `Dialogue` as the ones to overwrite the `Order` modifications. I know it won't override the changes I'm doing!

Is this the way to do it? Or is there a better way?