Aborting a Merge
- When doing a merge, you may run into one or more conflicts. If you're not ready to handle these conflicts we can easily go back to the state before we started the merge.
git merge --abort
Git
- Initialize Repository
- Git Workflow
- Staging Files
- Committing Changes
- Committing Best Practices
- Skipping Staging and Committing
- Remove Files
- Renaming or Moving Files
- Gitignore
- Git Short Status
- View Staged and Unstaged Changes/Differences
- Visual Diff Tools
- Viewing History
- Viewing Commit
- Unstaging Files
- Discarding Local Changes
- Restoring a File to an Earlier Version
- What are Branches
- Working with Branches
- Comparing Branches
- Stashing Changes
- Git Merging
- Fast Foward Merge
- 3-Way Merge
- View Merged and Unmerged Branches
- Merge Conflicts
- Aborting a Merge
- Undoing a Faulty Merge
- Squash Merging
- Git Rebasing
- Cherry Picking
- Picking file from another branch
- Branching in VS Code