If in the middle of a git rebase operation I say git rebase --continue, and I'm then presented with several merge conflicts, will Git Bash let me return to where I left off if I need to reboot my PC now due to a Windows Update? I am using GitLab.
Rebooting During Git Bash Rebase Operation
32 Views Asked by ShieldOfSalvation At
1
There are 1 best solutions below
Related Questions in GIT
- problem to push files on a repository git
- diff3 output in git conflict style, including mergeable hunks
- Git Not In Sync with Local Branch
- Setting up the version control of .dotfiles while the .config is connected to a forked repo
- How to fix overriding the main branch in Git?
- I can't add text to "Message" in VS Code when committing to Git
- How can i redirect pull request from main branch to another branch
- Xcode commits (possibly outside of any branch) disappeared, how to get them back?
- Git/TortoiseGit : how to apply ONLY the changes from ONE commit from branch A, to branch B?
- How can I reintroduce username an password on git using fedora?
- GIT SKIP EMPTY DIRECTORIES
- Git smudge run once per checkout or per commit?
- I can't find ~/.profile or ~/.bashrc in C:/Users/<user>/.ssh folder
- Set environment variable during push for GitHub Actions
- Android WebRTC compile
Related Questions in GIT-REBASE
- Rebase over some branch with ignoring previusly dropped commit(s)
- Git rebase without re-adding dropped commits
- How can I avoid fixing other peoples merges when doing a git rebase
- How Can I Convert Tabs To Spaces Using Rebase?
- Git rebasing attribute the change to the wrong file
- Rebooting During Git Bash Rebase Operation
- VScode can't open git-rebase-todo
- Applying Git commits from one branch to another completely unrelated branch
- Is it safe to rebase remote branch if nobody based work on it?
- How do I avoid Git's `--fork-point` becoming confused by a retroactively created branch?
- Git rebase to squash commits reverts local to several commits prior
- How to re-use a branch of commits periodically?
- Git rebase undos all changes/commits to local branch
- Issue with including changes from a previous branch in the current pull request after merging another branch in Git
- git interactive rebase: reword without confirming each commit
Related Questions in MERGE-CONFLICT-RESOLUTION
- Automatic resolution of merge conflicts on GitHub pull request page
- Can't resolve merge conflict in TortoiseGit
- Cant get merge conflict to appear locally but Azure devops says I have a conflict?
- Rebooting During Git Bash Rebase Operation
- Why is the BASE file generated by TortoiseGit in merge conflict resolution 0 bytes?
- In IntelliJ IDEA, can I switch branches in the middle of resolving merge conflicts and resume it later where I left off?
- Resolving merge conflict with several commits on a branch
- How to resolve git conflict locally (with some constraints)?
- How to Auto-Resolve Git Subtree Conflicts with Three-Way Merge Strategy?
- Automate Merge Conflicts in git
- How to set utf-8 as default encoding for pull request merge conflict extension in azure devops?
- Git conflicts between two protected branches
- Merging two protected branches in gitlab after squashing commits
- Why does git checkout --ours/theirs not work?
- Forcefully set files status as "unmerged" in a Git repository
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
I was scared to reboot and lose what amounted to over a hundred steps of merge conflicts still remaining and having done quite a few of them already. So before I rebooted I got to a safe stopping point by completing the current merge conflicts at this step, running a "git add .", performing a git status. Upon seeing the following message, I then rebooted:
I was then able to recover from where I left off after a reboot.
Upon restarting and returning to a Git Bash session, I just did another git rebase --continue and I was able to move on to the next step. Everything worked seamlessly even after the reboot.