Git Branching
Use a branch to isolate development work without affecting other branches in the repository. Each repository has one default branch and can have multiple other branches. You can merge a branch into another branch using a pull request.
Branches allow you to develop features, fix bugs, or safely experiment with new ideas in a contained area of your repository.
Git Revert and Reset
Two commonly used tools that git users will encounter are git reset and git revert. The benefit of both of these commands is that you can use them to remove or edit changes you’ve made in the code in previous commits.
Git Rebase and Merge
What Is Git Rebase?
Git rebase is a command that lets users integrate changes from one branch to another, and the logs are modified once the action is complete. Git rebase was developed to overcome merging’s shortcomings, specifically regarding logs.
What Is Git Merge?
Git merge is a command that allows developers to merge Git branches while the logs of commits on branches remain intact.
The merge wording can be confusing because we have two methods of merging branches and one of those ways is actually called “merge,” even though both procedures do essentially the same thing.
Refer to this article for a better understanding of Git Rebase and Merge
Task :
Add a text file called version01.txt inside the Devops/Git/ with “This is the first feature of our application” written inside. This should be in a branch coming from master, [hint try git checkout -b dev], switch to dev branch ( Make sure your commit message will reflect as "Added new feature"). [Hint use your knowledge of creating branches and Git commits commands.]
Task 2:
Demonstrate the concept of branches with 2 or more branches with a screenshot.
add some changes to
devthe branch and merge that branch inmasteras a practice try git rebase too, and see what difference you get version01.txt should reflect at the local repo first followed by the Remote repo for review. [Hint use your knowledge of Git push and git pull commands here]
Add new commit in
devbranch after adding below-mentioned content in Devops/Git/version01.txt: While writing the file make sure you write these lines1st line>> This is the bug fix in a development branch
Added feature2 in the development branch
2nd line>> This is gadbad code
Commit this with the message “ Added feature3 in development branch
3rd line>> This feature will gadbad everything from now.
Commit with the message “ Added feature4 in the development branch
git log: Git log is a utility tool to review and read the history of everything that happens to a repository.
git log --oneline - The online option is used to display the output as one commit
per line.
Restore the file to a previous version where the content should be “This is the bug fix in the development branch” [Hint use git revert or reset according to your knowledge]
git reset: Reset the current HEAD to the specified state.syntax:
git reset <commit_ID>In the below image, if you will do a git log you can see only two commits as the reset ones are deleted.
Task 2:
Demonstrate the concept of branches with 2 or more branches with a screenshot.
git branch:A branch is a version of the repository that diverges from the main working project. It is a feature available in most modern version control systems. A Git project can have more than one branch
Git command :
Create a new Branch: git branch -b <branch name >
Show git branch: git branch
To go to a specific branch: git checkout <branch-name>
Creating and going to that branch: git checkout -b <branch-name>
add some changes to
devthe branch and merge that branch inmaster
git merge: Git merge is a command that allows developers to merge Git branches while the logs of commits on branches remain intact.
As a practice try git rebase too, and see what difference you get.
git rebase:
Rebasing is the process of moving or combining a sequence of commits to a new base commit. Rebasing is most useful and easily visualized in the context of a feature branching workflow. The primary reason for rebasing is to maintain a linear project history.
git rebase <base>
Thank you for reading this blog !
Happy learning!