git - Concepts

Explore concepts tagged with "git"

Total concepts: 9

Concepts

Merge Conflict - When version control cannot automatically combine changes because different branches modified the same code incompatibly.
Feature Branching - A development workflow where each new feature is developed in a dedicated branch before being merged into the main codebase.
Stash - Temporarily shelving uncommitted changes to work on something else without losing work in progress.
Cherry-pick - Selectively applying specific commits from one branch to another without merging the entire branch.
GitFlow - A structured branching model for Git with specific branch types for features, releases, and hotfixes.
Clone - Creating a complete local copy of a remote repository, including all files, branches, and history.
Remote - A reference to a repository hosted on a server, enabling collaboration and synchronization in distributed version control.
Rebase - Reapplying commits on top of another base commit to create a linear history in version control.
Staging Area - An intermediate space in Git where you prepare and review changes before committing them to the repository.