Git Questions – How and When Do I Merge or Rebase? [Video]

DZone's Guide to

Git Questions – How and When Do I Merge or Rebase? [Video]

Knowing when to merge or rebase your code in Git is an important part of using Git. So when do you do it, and do you merge OR rebase? Read on for some insight.

Trisha Gee

Jul. 14, 17 · DevOps Zone

Free Resource

Like (0)

Comment (0)

Save

{{ articles[0].views | formatCount}} Views

Download the blueprint that can take a company of any maturity level all the way up to enterprise-scale continuous delivery using a combination of Automic Release Automation, Automic’s 20+ years of business automation experience, and the proven tools and practices the company is already leveraging.

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.

Download the ‘Practical Blueprint to Continuous Delivery’ to learn how Automic Release Automation can help you begin or continue your company’s digital transformation.

DOWNLOAD

Topics:

intellij ,git ,merge ,rebase ,devops ,video

Like (0)

Comment (0)

Save

{{ articles[0].views | formatCount}} Views

Published at DZone with permission of Trisha Gee, DZone MVB. See the original article here.

Opinions expressed by DZone contributors are their own.

Git Questions – How and When Do I Merge or Rebase? [Video]

Git Questions – How and When Do I Merge or Rebase? [Video]

Knowing when to merge or rebase your code in Git is an important part of using Git. So when do you do it, and do you merge OR rebase? Read on for some insight.

DevOps Partner Resources

DevOps Partner Resources

{{ editionName }}

{{ parent.title || parent.header.title}}

{{ parent.tldr }}

{{ parent.linkDescription }}

Git Questions – How and When Do I Merge or Rebase? [Video]

Git Questions – How and When Do I Merge or Rebase? [Video]

Knowing when to merge or rebase your code in Git is an important part of using Git. So when do you do it, and do you merge OR rebase? Read on for some insight.

Like This Article? Read More From DZone

DevOps Partner Resources

DevOps Partner Resources

{{ editionName }}

{{ parent.title || parent.header.title}}

{{ parent.tldr }}

{{ parent.linkDescription }}