When using Git Rebase, the following command often appears
git rebase -i resumeerror: could not apply 6b442cc… accout infoWhen you have resolved this problem, run “git rebase –continue”.If you prefer to skip this patch, run “git rebase –skip” instead.To check out the original branch and stop rebasing, run “git rebase –abort”.Could not apply 6b442cc81d1feba15b2f851753483a82b1044438… accout info
You can use Git Status to see the cause of this problem
git rebase -i resumeerror: could not apply 6b442cc… accout infoWhen you have resolved this problem, run “git rebase –continue”.If you prefer to skip this patch, run “git rebase –skip” instead.To check out the original branch and stop rebasing, run “git rebase –abort”.Could not apply 6b442cc81d1feba15b2f851753483a82b1044438… accout info
You can use Git Status to see the cause of this problem
Both modified: SRC/resume/js/account/index/the js
Both added: SRC/resume/js/account/index/the vm
Both modified: SRC/resume/js/account/modules/the js
Both modified: SRC/resume/js/account/modules/info. The js
It tells us that we have modified these files at the same time and there is a conflict
So here’s the next step
1. Conflict resolution
2. The git add git commit
3. git rebase –continue
Read More:
- Vacuum box installation CentOS encountered the pit
- How to Solve Infinite scroll the pit encountered
- Pit encountered by entity class data type BigDecimal
- You are not allowed to upload merges in Git push
- Typeerror in gitbook init: cb.apply is not a function solution
- Git error prompt: fatal: not a git repository (or any of the parent directories):. Git
- Refused to apply style from ＜URL＞ because its MIME type (‘text/html‘) is not a supported stylesheet
- NPM install error cb.apply is not a function
- Solve the problem of warning in sourcetree: templates not found / usr / local / git / share / git core / templates
- Typeerror occurred during gitbook installation: cb.apply is not a function
- Git commit encountered error: pathspec (Fixed)
- Arduino ide 1.6.9 problems encountered error:’TKD2′ was not declared in this scope
- git push fatal Error: HttpRequestException encountered.
- Git push you are not allowed to upload merges
- Docker builds the pit that Seata stepped on. can not connect to services-server
- [Git] git pull pull remote git push to remote git commit submit reject
- Git prompts another git process sees to be running in this repository, e.g. an editor opened by
- Git bash run error, GIT 32 bit
- QT encountered in CentOS installation（ qt.qpa.plugin : Could not load the Qt platform plugin “xcb” ）
- Error in publishing project with Maven in idea. Git directory is not found! Please specify a valid