Skip to main content
Practice

1

deck

Essential Git Terminology (1)

English ExpressionInterpretation
squash the last 3 commitsCombine the last 3 commits
push commits to a repositoryDeliver commits to a repository
merge a feature branch into the base branchMerge a feature branch into the base branch
revert a pull requestRevert a pull request to its previous state
request a reviewRequest a review
comment on a pull requestLeave a comment on a pull request
resolve a merge conflictResolve a merge conflict
rebase onto another branchRebase onto another branch
clone a repositoryClone a repository

===

Essential Git Terminology (2)

English ExpressionInterpretation
close a pull request without merging it into the branchClose a pull request without merging it into the branch
fork a repositoryCopy a repository to create a new one in your account
checkout a branchSwitch to a different branch
stage changes for commitTemporarily save changes for a commit
pull the latest changesFetch the latest changes or code from a remote repository
cherry-pick a commitSelectively apply a specific commit
amend a commit messageModify a commit message
discard uncommitted changesDiscard uncommitted changes

===

Reference: What is Rebase?

Rebasing is a method of integrating changes from one Git branch into another. Unlike merging, it allows you to change the separated base to the latest base, keeping the history clean. It is useful for organizing the commit history, but it can cause conflicts during collaboration, so it should be used with caution.

Want to learn more?

Join CodeFriends Plus membership or enroll in a course to start your journey.