Question: I am using an Iframe to load the contents within an iframe every 5 seconds. It works fine. What happens is, it just keeps blinking every time it loads, which is bit annoying.

I want to convert the iframe code to scrolling div so the iframe src contents keep getting loaded every 5 seconds and the blinking should go away. 

Here is my code: 

My Home Page (*INDEX.HTML*) has: 

```
<iframe src="messages.php#bottom" width="674" height="476" frameborder="0" name="main" allowtransparency="yes" scrolling="auto"/></iframe>

```

The Contents of Messages.php is like this 

```
<html>
<head>
<script>
    window.onload = function() { setTimeout("window.location.href='messages.php';", 5000) }; // 5000 = 2 seconds (it's in milliseconds)
    </script>
</head>
<body>
<?php Application.logs ?>
</body>
</html>

```

I am trying to use this file: 

<https://gist.github.com/aklump/5470863> - but not able to spin my head around how to do it

Answer: 
The easiest way to this is by using the Git bash that msysgit provides.

You can setup multiple origins and you can merge their branches with your current working tree. I assume the other person made only changes his master branch.

**First**
setup the other repository as another remote:
`git remote add bitb "https://bitbucket......."`

**Then**
fetch the changes from this remote
`git fetch bitb master`

**And now you have to decide**

**a) Usually (the simple, git-way of doing things)** you merge the other branch into your master branch
`git merge bitb/master`

This way you preserve all his commits and merge them with your changes in `master`. Your repositories will also stay compatible together for future collaboration.

**b) I don't think you really want to squash all his changes into one single commit and merge this** in which case you **lose** all his notes and simple changes and the compatibility of your repositories.

If you really wanted to do so you could switch to his branch (`git checkout bitb/master`) and use `git rebase -i master` to squash all his commits since he diverged from master into one single commit, switch back to master (`git checkout master` and merge the single commit to your master (`git merge bitb/master`)

**Think about the Keep-it-simple principle and select the first option.**
Well I ask myself if you even want to merge the changes or just get an exact copy of what the other person has done. You might also `git reset --hard bitb/master` and your working tree will look perfectly the same as at the other person's computer. You will however lose commits you made since you gave the other person the code...