@WebStormIDE Hi, when I do 'git pull origin feature -r' I need to resolve conflicts, but sometimes after I resolved, I do 'git rebase --continue', but then there are no any file in the 'Version control' panel which need I to resolve conflict again
What does `git status` show at that moment? And why do you need to use `rebase --skip` then? We're trying to understand your use case better. Any reason why you don't use Update project in the IDE?
-
-
"why do you need to use `rebase --skip` then?" Because if I don't do that, I will **still in** the rebase process and I also can't do 'git rebase --continue' because it has no effect so I have to do 'git rebase --continue'
-
Have you tried doing rebase in the IDE? Here's how to do that: https://www.jetbrains.com/help/webstorm/apply-changes-from-one-branch-to-another.html#rebase-branch …
End of conversation
New conversation -
-
-
"Any reason why you don't use Update project in the IDE?" Oh, I don't know this, any doc could you share?
- End of conversation
New conversation -
-
-
"What does `git status` show at that moment?", I didn't try that but I guess it shows I need to resolve conflict even though there is no conflict(by the way, even I use iTerm2 it's the same)
Thanks. Twitter will use this to make your timeline better. UndoUndo
-
Loading seems to be taking a while.
Twitter may be over capacity or experiencing a momentary hiccup. Try again or visit Twitter Status for more information.