IAC - Version Control
GITHUB
GITHUB
  • Background
  • Setting up GitHub
  • Windows
    • Working with a cloned repo
    • Populating a repo from local files
    • Integrate VSCode
  • Linux
    • Using SSH
    • GH Command Line
  • The Basics
    • Forks
    • Logs
    • Undoing Local Changes
  • Larger Projects
    • Setting up a repo
    • Creating my Branch Architecture Locally
    • Creating a Feature Branch
    • Creating my Branch Architecture on GitHub
    • Merging the changes from GitHub on my local machine
    • Merging the changes from my local machine to GitHub
    • Sync the branches in GitHub
  • Finally
Powered by GitBook
On this page
  1. Larger Projects

Merging the changes from GitHub on my local machine

PreviousCreating my Branch Architecture on GitHubNextMerging the changes from my local machine to GitHub

On my local machine, I pull changes from remote.

I can pull the remote Test branch.

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

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

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.

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.

I check on GitHub, the change is there!