@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
-
Show this thread
-
so I have to do 'git rebase --skip', do you have any thought about this?
1 reply 0 retweets 0 likesShow this thread -
Replying to @Heaven_xz
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?
3 replies 0 retweets 0 likes -
Replying to @WebStormIDE
"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'
1 reply 0 retweets 0 likes
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 …
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.