> For the complete documentation index, see [llms.txt](https://johnoraw.gitbook.io/iac-version-control/llms.txt). Markdown versions of documentation pages are available by appending `.md` to page URLs; this page is available as [Markdown](https://johnoraw.gitbook.io/iac-version-control/github/larger-projects/merging-the-changes-from-github-on-my-local-machine.md).

# Merging the changes from GitHub on my local machine

On my local machine, I pull changes from remote.

<figure><img src="https://content.gitbook.com/content/C1tv1gDCmQOVxTprzQP4/blobs/BBe4FAr3YFLsM7yafOLh/image.png" alt=""><figcaption></figcaption></figure>

I can pull the remote **Test** branch.

<figure><img src="https://content.gitbook.com/content/C1tv1gDCmQOVxTprzQP4/blobs/9PzGHD8YK6ctTnPNspcE/image.png" alt=""><figcaption></figcaption></figure>

And I also pull the **bug-fix-readme** branch.

<figure><img src="https://content.gitbook.com/content/C1tv1gDCmQOVxTprzQP4/blobs/BBjGOtp7yQanFbFeC9Sd/image.png" alt=""><figcaption></figcaption></figure>

If I do a **git log** command, I can see my trivial edit!

<figure><img src="https://content.gitbook.com/content/C1tv1gDCmQOVxTprzQP4/blobs/spXmwgO8XiQ1FY5y9ffq/image.png" alt=""><figcaption></figcaption></figure>

Now I can merge the bug fix back into **Test**. I make **Test** active and merge the bug fix branch into it. I can then delete my bug fix branch both locally and remotely.

<figure><img src="https://content.gitbook.com/content/C1tv1gDCmQOVxTprzQP4/blobs/ZZRmnmCUUE3ou21TJcqb/image.png" alt=""><figcaption></figcaption></figure>

I check on GitHub and although the **bug-fix-readme** branch is gone, the **Test** branch has not been updated. I need to **Push** it.

<figure><img src="https://content.gitbook.com/content/C1tv1gDCmQOVxTprzQP4/blobs/CChmB9bQQKUDgAhWC7mG/image.png" alt=""><figcaption></figcaption></figure>

I check on GitHub, the change is there!

<figure><img src="https://content.gitbook.com/content/C1tv1gDCmQOVxTprzQP4/blobs/jcLaTlEXJrLpUfQmFv8g/image.png" alt=""><figcaption></figcaption></figure>