The JetBrains Blog

Blog

Skip to content
  • Blogs by Topic
  • Search
  • Language
    • English
    • Deutsch
    • Español
    • Français
    • 日本語
    • 한국어
    • Русский
    • 简体中文
    • Português do Brasil
    • Türkçe
Burger menu icon
    • IDEs

      • AppCode
      • CLion
      • DataGrip
      • DataSpell
      • Fleet
      • GoLand
      • IntelliJ IDEA
      • PhpStorm
      • PyCharm
      • Rider
      • RubyMine
      • WebStorm
    • Plugins & Services

      • Big Data Tools
      • Code With Me
      • Quality Assurance
      • JetBrains Platform
      • Rust
      • Scala
      • Toolbox App
      • Writerside
    • Team Tools

      • Datalore
      • Space
      • TeamCity
      • Upsource
      • YouTrack
      • Hub
      • Qodana
    • .NET & Visual Studio

      • .NET Tools
      • ReSharper C++
    • Languages & Frameworks

      • Kotlin
      • Ktor
      • MPS
    • Education & Research

      • JetBrains Academy
      • Research
    • Company

      • Company Blog
      • Security
Idea logo

The IntelliJ IDEA Blog

IntelliJ IDEA – the Leading Java and Kotlin IDE, by JetBrains

Follow
  • Follow IntelliJ IDEA:
  • Twitter
  • Facebook
  • Youtube
  • RSS
Download
Follow
  • Follow IntelliJ IDEA:
  • Twitter
  • Facebook
  • Youtube
  • RSS
  • All
  • News
  • Releases
  • Webinars
  • Tips & Tricks
  • Early Access Program
  • Plugins
Download

Git Log

Git Questions – How and When do I Merge or Rebase?

Ever since Gary and I started the Git Questions video series, we've been asked to talk about merging.  We're also frequently asked about rebasing - what is it, and when should I do it? In this week's video, we take a look at how to use IntelliJ IDEA to merge a branch back into the "main" development branch.  We also talk about rebasing - not only showing how to do it in the IDE, but what it means and when you should do it. We don't show how to deal with merge conflicts in this video, but they are discussed, and a more complete conflict-resolution video is definitely high on the TODO list

Trisha Gee Trisha Gee

Fresh EAP with Refactorings to Java 8, Better VCS and Gradle Integrations

A new IntellIJ IDEA 2016.3 EAP build is out and ready to try. Other than the usual amount of bugfixes, it brings a couple of noticeable improvements. More Refactorings to Java 8 First of all, we continue with tuning the inspections that help refactor regular code into idiomatic Java 8. (more…)

Andrey Cheptsov Andrey Cheptsov
  • Privacy & Security
  • Terms of Use
  • Legal
  • Genuine tools
Language
  • English
  • Deutsch
  • Español
  • Français
  • 日本語
  • 한국어
  • Русский
  • 简体中文
  • Português do Brasil
  • Türkçe
  • Twitter
  • Facebook
  • Linkedin
  • Instagram
  • Youtube
  • RSS
Copyright © 2000–2022 JetBrains s.r.o.