IntelliJ IDEA Pro Tips: Using Git Interactive Rebase

[@ChrisB_Crisps]

I love the accent of this dev advocate and that there intonation but the highs and lows and not very extreme and appropriate to the type of content (technical recorded demo video), very easy to understand for me as a non-british-english speakers. Great work

[@GakisStylianos]

Wow this is so useful. Can't believe it's taken me so many years without realizing this exists 🤯

[@Pictor13]

Nice and simple interface. It's worth mentioning that the GIT HISTORY SHOULD NEVER BE REWRITTEN (IF ONE DOESN'T KNOW WHAT THEY ARE DOING). Rebasing interactively when on a shared/remote branch will create a lot of problems to you and your colleagues.

[@allanjuan1149]

Can't get more clear than that. Great video

[@petroniobonavides3530]

Sugesttion: Increase the font size, in IDE, when make the videos

[@petroniobonavides3530]

Suggestion: do a complete playlist focused in Intellij substituting the gir command lines....for example: this video will substitute "git rebase -i Head~2"(2 is a example).. the idea is showing how Intellij can do a gitCli jobs.

[@maritvandijk]

Great idea! It's good to know both so you can use whichever you prefer. We added a tutorial that also includes how to do the same from the command line: www.jetbrains.com/idea/guide/tutorials/git-interactive-rebase/

[@petroniobonavides3530]

@@maritvandijk yep... But, it's good to highlight that.. although the Intellij is able to provide a Intellij-UI for git-cli-commands, if the user "do not know" the command beforehand in git-cli, the user will not understand properly the concept vidual-done by Intellij. However, let's be frankly do squashes,rewords,drop,..etc... Using git rebase -i HEAD~N is a boring and actually is a PInTheA..

[@exsesx]

Very powerful feature, thanks for the highlight 👍🏻

[@nmarulodev]

Interesting, thanks for the tip.

[@DinHamburg]

Useful stuff, indeed

[@felipegutierrez7856]

very useful stuff. I used to do everything from command line and in the end I have to do "git push --force-with-lease". I've noticed that when I do from IntelliJ I still needed to execute "git push --force-with-lease" from the terminal in the end. Is there by any chance that this was forgotten in the video or is there an option to check IntelliJ that does it after I click in "start rebase"?

[@ChronoWrinkle]

Would be good to also explain how push works in this scenario. it seems that im able to push such changes only using force push, it is so unobvious tbh

[@exsesx]

I have a specific case that has occurred quite in a while. It is changing the commit message or author without changing the commit date. Can this feature do that?

[@krzysztofbarczynski6736]

It's easy to manipulate commits if there are no conflicts... Having conflicted files would be much more beneficial.

[@maritvandijk]

We just released a video on Resolving Merge Conflicts in Git. You can find it here: kzbin.info/www/bejne/jZjMoYqhlrplg68

[@petroniobonavides3530]

Question: Why this Intellij "Git Rebase" does not work after Git push???

[@RutgerOlthuis]

Because push puts the changes on the git server. So other developers might already have pulled those changes to their local repository and they might already have done their own changes based on the history you pushed to the central repo.

[@RicardoDirani]

Impressive

[@Almighty_Flat_Earth]

Still we don't get the collapsible tree view feature while comparing two folders, it's a shame this basic feature is missing from a paid software. For many years, many requests have been active in YouTrack, but not implemented in jetbrains products. A free program called Meld has this feature. Unbelievable. You people don't know how to implement this feature? Or you don't want us to use it.

[@michaels.7562]

You probably omitted the "edit" option because that's a topic worth an own video.

[@maritvandijk]

Yes, there is much more we could talk about. There is a little bit on how to edit or reword the commit message in the tutorial: www.jetbrains.com/idea/guide/tutorials/git-interactive-rebase/

[@p.j.meisch701]

Please re-record this in a quality where the text in the dialogs can be read.

[@AmxCsifier]

When you think you know all the JetBrains features...

[@jopadjr]

75th...Thanks

[@ZelenoJabko]

Fix Wayland support for once

[@ILyaCyclone]

Now i know kung fu