When you rebase a commit or a branch on top of a different HEAD, you may eventually see a conflict.
If there is a conflict, you will be asked to solve the merge conflict and continue with the rebase using git rebase --continue.
Continuing a rebase with merge conflicts
by Aske Olsson, Rasmus Voss, Emanuele Zattin, Kenneth Geisshirt
Git Version Control Cookbook
- Title Page
- Copyright and Credits
- Packt Upsell
- Contributors
- Preface
- Navigating Git
- Configuration
- Branching, Merging, and Options
- Rebasing Regularly and Interactively, and Other Use Cases
- Storing Additional Information in Your Repository
- Extracting Data from the Repository
- Enhancing Your Daily Work with Git Hooks, Aliases, and Scripts
- Recovering from Mistakes
- Introduction
- Undo – Remove a commit completely
- Undo – Remove a commit and retain changes to files
- Undo – Remove a commit and retain changes in the staging area
- Undo – Working with a dirty area
- Redo – Recreate the latest commit with new changes
- Revert – Undo the changes introduced by a commit
- Reverting a merge
- Viewing past Git actions with git reflog
- Finding lost changes with git fsck
- Repository Maintenance
- Introduction
- Pruning remote branches
- Running garbage collection manually
- Turning off automatic garbage collection
- Splitting a repository
- Rewriting history – changing a single file
- Creating a backup of your repositories as mirror repositories
- A quick "how-to" submodule
- Subtree merging
- Submodule versus subtree merging
- Patching and Offline Sharing
- Tips and Tricks
- Git Providers, Integrations, and Clients
- Other Books You May Enjoy
Continuing a rebase with merge conflicts
-
No Comment
..................Content has been hidden....................
You can't read the all page of ebook, please click here login for view all page.