How to switch branches and commit changes in git

Key Concepts

• Git Switch: A Git command used to change branches.
• Git Status: A Git command used to display the state of the working directory and staging area.
• Git Add: A Git command used to add changes from the working directory to the staging area.
• Git Commit: A Git command used to record changes to the repository.
• Staging Area: An intermediate area where changes are prepared for commit.
• Working Tree: The files and directories that you are currently working with.
• Local Repository: The Git repository on your computer.

Returning to the Main Branch & Branch Modification

The video demonstrates how to navigate between Git branches and make changes to files within a specific branch. Initially, the user is instructed to return to the main branch using the command git switch main. This command effectively switches the working directory to reflect the state of the main branch. Confirmation is provided that the user is now operating on the main branch.

Branching, Editing & Status Updates

Following the return to main, the process shifts to revisiting a previously created branch (referred to as "update name"). The user is guided to switch to this branch using git switch update name. To facilitate code editing, the project is opened in Visual Studio Code (VS Code). Within VS Code, the index.html file is opened using the "Open Preview" option, which provides a live view of the changes made to the code in a side browser.

Implementing Changes & Committing to the Repository

The specific task assigned is to change the title of the application to "get going". After modifying the index.html file to reflect this change, the user utilizes git status to verify that the file has been modified. The output of git status confirms the change.

The next step involves adding the modified file to the staging area using git add . (the period signifies adding all modified files in the current directory). Following staging, the changes are committed to the local repository with the message "update app name" using the command git commit -m update app name.

A final git status command is executed to confirm that no further changes are pending. The output, "Nothing to commit. Working tree clean," indicates a successful commit and a clean working directory.

Logical Flow & Takeaways

The video presents a clear, sequential workflow for branch management and code modification using Git. It begins with branch switching, proceeds to file editing and previewing, and culminates in staging and committing changes. The consistent use of git status throughout the process emphasizes the importance of tracking changes and ensuring a clean working directory. The demonstration highlights a fundamental Git workflow: modify files, stage changes, and commit those changes with a descriptive message.