Using Git efficiently: SmartGit + BeyondCompare

Published by marco on

Updated by marco on

I’ve written about using SmartGit (SG) before[1][2] and I still strongly recommend that developers who manage projects use a UI for Git.

If you’re just developing a single issue at a time and can branch, commit changes and make pull requests with your IDE tools, then more power to you. For this kind of limited workflow, you can get away with a limited tool-set without too big of a safety or efficiency penalty.

However, if you need an overview or need to more management, then you’re going to sacrifice efficiency and possibly correctness if you use only the command line or IDE tools.

I tend to manage Git repositories, which means I’m in charge of pruning merged or obsolete branches and making sure that everything is merged. A well-rendered log view and overview of branches is indispensable for this kind of work.

SmartGit

I have been and continue to be a proponent of SmartGit for all Git-related work. It not only has a powerful and intuitive UI, it also supports pull requests, including code comments that integrate with BitBucket, GitLab and GitHub, among others.

It has a wonderful log view that I now regularly use as my standard view. It’s fast and accurate (I almost never have to refresh explicitly to see changes) and I have a quick overview of the workspace, the index and recent commits. I can search for files and easily get individual logs and blame.

The file-differ has gotten a lot better and has almost achieved parity with my favorite diffing/merging tool Beyond Compare. Almost, but not quite. The difference is still significant enough to justify Beyond Compare’s purchase price of $60.

What’s better in Beyond Compare[3]?

Diffing

  • While both differs have syntax-highlighting (and the supported file-types seem to be about the same), Beyond Compare distinguishes between significant and insignificant (e.g. comments or whitespace) changes. It makes it much easier to see whether code or documentation has changed.
  • The intra-line diffing in Beyond Compare is more fine-grained and tends to highlight changes better. SmartGit is catching up in this regard.
  • You can re-align a diff manually using <key>F7</key>. This is helpful if you moved code and want to compare two chunks that the standard diff no longer sees as being comparable

Merging

I could live without the Beyond Compare differ, but not without the merger.

 TextMerge in BeyondCompare Pro

  • The 4-pane view shows left, base and right above as well as the target below, with the target window being editable. Each change has its own color, so you can see afterwards whether you took left, right or made manual changes.
  • The merge view includes a line-by-line differ that shows left, base, right and target lines directly above one another, with a scrollbar for longer lines.
  • The target view is color-coded to show the origin of each line of text: right, left, base or custom edited.
  • BeyondCompare makes a smart recommendation for how to merge a given conflict that is very often exactly what you want, which means that for many conflicts, you can just confirm the recommendation.
  • SmartGit has two separate windows for base vs. left/right and right/left vs. target. Long lines are really hard to decipher/merge in SmartGit

Integrate Beyond Compare into SmartGit

To set up SmartGit to use Beyond Compare

  1. Select Tools > Diff Tools
    1. Click the “Add…” button
    2. Set File Pattern to *
    3. Select “External diff tool”
    4. Set the command to C:\Program Files (x86)\Beyond Compare 4\BCompare.exe
    5. Set the arguments to “${leftFile}” “${rightFile}”
  2. Select Tools > Conflict Solvers
    1. Select “External Conflict Solver”
    2. Set File Pattern to *
    3. Set the command to C:\Program Files (x86)\Beyond Compare 4\BCompare.exe
    4. Set the arguments to “${leftFile}” “${rightFile}” “${baseFile}” “${mergedFile}”


[2] I am in no way affiliated with SmartGit.
[3] I am in no way affiliated with BeyondCompare.

Comments

2 Replies

#1 − Aol gold download install | Aol desktop gold reinstall

marciezell (updated by marciezell)

Upgrading from AOL Desktop to AOL Desktop Gold or availing a contemporary subscription for an equivalent, the primary issue you wish to listen to is that your system ought to meet the specified specifications. Now, the steps for AOL Gold download install method varies for the AOL Advantage set up members, AOL trial version users, and people WHO have received a link within the official AOL Signup confirmation email. notwithstanding that among these 3 you’re however bear in mind to follow the directions rigorously to confirm the made AOL desktop gold download. Once you end the method, proceed to AOL Desktop Gold install by gap up your system’s drive then the Downloads folder, double-clicking the Install_AOL_Desktop icon on the market within the shown programs list, clicking Run, and lastly, Install currently. Follow more prompts and therefore the code are going to be put in with success. And, if it’s not, then be happy to require the assistance from AOL client support professionals. The team also can be contacted to grasp the stepwise procedure for the AOL Desktop Gold reinstall method, that is needed if your put in version corrupts otherwise you modification your device.

#2 − How to reset your Account Live password ?

marciezell

Are you unable to reset your Account Live password even if you didn’t get the verification code? Well, in this case, you have to click “I didn’t get the verification code” link at the Account Live com password reset page. Doing this will redirect you to the account.live.com/acsr where you can use some other email address to reset your Account Live password. But, if you don’t have any other email address, then click the “Create a new one with Outlook.com” link and proceed according to the onscreen instructions.Use this newly created email address at account.live.com/acsr page to set a new password for your Microsoft account. Make sure the new password is strong enough to ditch the cybercriminals eyeing on your account. If the two-step verification is on, then visit account.live.com/password/reset for performing the steps for Account Live password reset process.