Yes that's true. And generally I've found squash commits much cleaner/easier with a rebase, you just have to be careful not to put loads of changes into it.

thanks

Better? I've just seen it and it's wrong. It confuses FF with rebasing, and the status of the branches it shows at the end are wrong.

At the very end She rebased develop on the Feature branch BUT she still needed to merge the feature branch ( a Fast forward ) into Develop. That's why develop branch is still behind the feature branch after the rebase.

Glad you enjoyed it!

only rebase locally on a branch that is not public and being used by others

Check out sourcetree www.sourcetreeapp.com/

The only method I know if is a "forced" git push. I'm not sure if JetBrains exposed that functionality in their IDE or not. Unfortunately, I don't primarily work in a language that they can provide an IDE for. Basically, what a "forced" git push is where you completely disregard the remote history and re-write it to what you have on your local. It's generally regarded as bad practice, but the golden rule I told my fellow developers is to only force git pushes when they're on features only you are working on, and before they've been merged into the development or master branches. Just be very careful with it.

Of course my answer is "it depends" :) When I've worked with feature branches, I usually push to my own repo (for remote backup), then if I rebase against upstream and force-push to my own repo, I'm not messing with anyone else (if anyone's using the branch in my own repo they do so at their own risk). If it's in a remote branch in the main repo, in the past I've worked on a team where we'd communicate our desire to rebase that branch and we would all take whatever measures were necessary to ensure no problems. Generally though I believe it's common practice not to rebase branches that have been pushed to a remote repo. I would say the exception to this is if that remote repo is your own, and/or you know no-one else is working on that branch.

Just in one particular case when you work on your feature branch and meanwhile someone added commits to master branch. So you rebase your feature branch onto master branch in order to UPDATE your feature branch. You will make it done like this: 1. make sure you are on your feature branch 2. type command: git rebase master

@@matkormidlo Correct. Which makes no intuitive sense. Especially in this video, you've changed develop branch.

Trisha is using IntelliJ IDEA but this is also relevant to our other IntelliJ-based IDEs.

You can send an email to support@jetbrains.com but we will see if we can try and find somebody to help.

@@JetBrainsTV right away, else I loose my job

As an immediate remedy you could use command line git to checkout the branch you need, and then contact support to find out what happened in the IDE

Tested renaming a branch and it works fine. Logs are needed to troubleshoot. From the description, it looks like IDE lost mapping to the git repository - check the Settings | Version Control. Also, check the git status and git branch in the command line

@@dmitriismirnov6089 Hey thanks a million this restored everything back to normal. I tried it earlier but with my develop branch and nothing happend. So after your comments I just did a git branch to see al my branches and then git checkout on the needed branch and it worked OMG!! thanks. newbies can be "foolish" sometimes.