Compare (Diff) branches in Tortoise Git, or how to preview changes before doing a merge

-
From "https://wikgren.fi/compare-diff-branches-in-tortoise-git-or-how-to-preview-changes-before-doing-a-merge/"



Compare (Diff) branches in Tortoise Git, or how to preview changes before doing a merge

06.11.2012 BY ·4 COMMENTS

I’ve recently switched over from SVN to Git in my version control. I’m a Windows user who’s used TortoiseSVN, so I was glad when I found out about TortoiseGit, which presents a very similar user interface to good ol’ TortoiseSVN. Still, there was lots to learn, as Git has a fundamentally different logic in storing the repository, both locally and remotely. Committing changes is a two step process unlike SVN’s single step.
Anyway, when doing software development in a project with several developers developing many braches, it’s sometimes nice to be able to take ‘sneak peek’ into the future and see what will happen when the branches are finally merged to one.
So how do you answer the question “what changes would be made if I merged these two branches right now?” Will there be any conflicts, for example? You could of course pull the changes from one branch to the other, but that is not always desirable.  There is a way to compare branches in TortoiseGit, but it’s faily well hidden by default.
Here’s how you can preview the changes before actually making them:
  • Shift-“right click” on your git folder
  • Select TortoiseGit >> Browse Reference
  • Select two branches from the list (hold shift to select more than one)
  • Right click and select “Compare selected refs”
This opens a window that displays the diff between the branches. Note that the diff is displayed as if the bottom branch (“Version 2”) was merged into the top branch (“Version 1”). There’s an arrow button at the top that lets you change the direction of comparison.

Comments

Post a Comment

Popular posts from this blog

Add GitHub Repository to DBeaver CE Secured with SSH Protocol

-
Image
  From  Add GitHub Repository to DBeaver CE Secured with SSH Protocol - tech jogging Add GitHub Repository to DBeaver CE Secured with SSH Protocol Date  2021-06-14 Views 2579 Category DBeaver ,  Git GitHub is a good addition to DBeaver Community Edition (CE). It allows to store scripts and other files in source control. Even with some limitations in DBeaver CE, GitHub full functionality can be utilized. There are varieties of ways connecting GitHub to DBeaver CE. SSH protocol provides with enhanced security and seamlessly integrated with DBeaver CE. In some cases, it can work when HTTPS one might be problematic. The article uses DBeaver 21.1.0 CE installed in Windows. 1. Prerequisite. Create SSH key Follow  Create SSH Key in DBeaver CE  article. 2. Prerequisite. Install DBeaver Git extension Follow  Install DBeaver CE Git Extension  article. 3. Open File menu and select Import menu item 4. Expand Git node and select any item, for example, Projects from Git 5. Select Clone URI 6. Go to
Read more

Keyboard Shortcut to "Toggle Line Comments" in DBeaver

-
Image
In DBeaver, "Ctrl+/" is the default shortcut to Toggle Line Comments. However, in keyboards without a dedicated / key, this may not work out of the box. In my case, the / is obtained with "Shift+7", which means I'd need to set "Ctrl+Shit+7" as the shortcut,  which DBeaver uses by default as the shortcut to "Activate results/panel": So, to set enable the Toggle Line Comments, I needed to remove the "Activate results/panel" configuration from the Preferences and I'm now able to use "Ctrl+Shit+7" for the Toggle Line Comments.
Read more

DBeaver Shortcuts

-
From  DBeaver 6.0 Shortcuts - Cacher Snippet   CTRL + ENTER = Executes SQL. CTRL + ALT + ENTER = In Editor, inits statement templates ALT + X = Executes All queries in current editor CTRL + ALT + SHIFT + X = Execute a script opening each query results in a separate tab CTRL + ] = New SQL Editor Windows CTRL + SHIFT + F = Format SQL CTRL + 9 = Set active connection CTRL + 0 = Set active Schema CTRL + 6 = Toggle Results Panel CTRL + SHIFT + 6 = Maximize Results Panel Tab (when a datarow is selected) = Toggle vertical view CTRL + Alt + Right/Left (When in vertical view) = Browse rows CTRL + SPACE = To perform some object name auto-complete F4 = To open current object (under cursor) definition From  Shortcuts · dbeaver/dbeaver Wiki · GitHub Here is a complete list of default hotkeys in DBeaver UI for Windows, Linux, and macOS users. It will help you work in DBeaver faster and more efficiently. Remember that you can always change the keyboard shortcut in the DBeaver settings. Go through:  W
Read more