DEV Community: Sunny

Cherry-Pick Your Teammate's Changes Without Push 'n Pull-ing To Your Repo In PhpStorm

Sunny — Wed, 01 Dec 2021 14:49:57 +0000

You asked your teammate for help with a piece of code and they showed you the solution in their editor. Now you need to fetch those changes. Usually, this would mean a series of tedious Git commands for both of you (not to mention that the changes will forever grace your git history), but no longer - GitLive allows you to cherry-pick your teammate's changes straight from their local files without having to push and pull to Git.

In PhpStorm, open up the team window by clicking on the GitLive icon on the bottom tool window bar.

This will show a list of your teammates, if they are online (or away) and the issue they are currently working on. Click the arrow on the left-hand side of the teammate that helped you to see the repositories they have cloned, locate the one they made the changes to and click the arrow beside that too.

Here, you can see the list of files changed by your teammate on their branch compared to the main branch. Files with asterisks next to the file icon contain changes made locally by your teammate that have not yet been pushed to the remote repository.

Since we are only interested in their local changes, click the filter icon at the bottom of the team window to filter to only the unpushed changes.

Now we can see the single file that contains the solution we want to copy! Clicking on it will open a diff of the changes so we can make sure it contains only the changes we need. Now all we need to do is to right click on the file and select the cherry-pick option to pick the changes. And voilà - no need for any git push- or git pull -ing!

You can also perform the cherry pick at the level above if you want to pick all changes from multiple files at once by right-clicking on the repository and selecting the cherry-pick option.

Don't have the GitLive extension installed yet? You can find GitLive here, and if you want to learn more, check out this blog post or the GitLive docs.

How To Enable Real-Time Merge Conflict Detection In Android Studio

Sunny — Wed, 27 Oct 2021 15:38:56 +0000

Ah, the dreaded resolve conflicts popup. You've finished crafting the perfect code, just a quick merge in of master (ahem, main) before you submit your PR, and then... 💥

If only there was an early warning system for merge conflicts so you could be better prepared or even avoid the conflicts in the first place I hear you say? Well if you are an Android Studio user today is your lucky day!

Firstly, you'll need to install and set up GitLive (the latest version requires the Bumblebee Beta version of Android Studio). Then if you right click the gutter on Android Studio, you will see the option to “Show Other's Changes".

It will be disabled if the file open in the editor is not from git or there are no other changes to it from contributors working on other branches (aka you are safe from conflicts). If it's enabled there will be one or more change indicators in the gutter of the editor.

These will show you where your teammates have made changes compared to your version of the file and even update in real-time as you and your teammates are editing.

If you've made a conflicting change you will see the bright red conflict indicator. These conflicts can be uncommitted local changes you have not pushed yet or existing changes on your branch that conflict with your teammates’ changes.

Click your teammate’s icon in the gutter to see the diff between your version and theirs, the branch the offending changes are from, and the issue connected to that branch if there is one.

From this popup you can also cherry-pick your teammate’s change directly from their local version of the file. For simple conflicts this can be a quick way to resolve them as identical changes on different branches will merge cleanly.

Unfortunately, it's not always possible to resolve a conflict straight away but with the early warning, you'll be better prepared, avoiding any nasty surprises at merge time!

Check out this blog post or the GitLive docs if you want to learn more.

How To Enable Real-Time Merge Conflict Detection In PyCharm

Sunny — Thu, 23 Sep 2021 13:22:39 +0000

Ah, the dreaded resolve conflicts popup. You've finished crafting the perfect code, just a quick merge in of master (ahem, main) before you submit your PR, and then... 💥

If only there was an early warning system for merge conflicts so you could be better prepared or even avoid the conflicts in the first place I hear you say? Well if you are a PyCharm user today is your lucky day!

Firstly, you'll need to install and set up GitLive. Then if you right click the gutter on PyCharm, you will see the option to “Show Other's Changes”.

These will show you where your teammates have made changes compared to your version of the file and even update in real-time as you and your teammates are editing.

Click your teammate’s icon in the gutter to see the diff between your version and theirs, the branch the offending changes are from, and the issue connected to that branch if there is one.

Unfortunately, it's not always possible to resolve a conflict straight away but with the early warning, you'll be better prepared, avoiding any nasty surprises at merge time!

Check out this blog post or the GitLive docs if you want to learn more.

GitLive 14.0: Codeshare without calling, view teammate's pushed changes, and more

Sunny — Mon, 16 Aug 2021 11:07:37 +0000

GitLive 14.0 has arrived! This update consists mostly of features requested by our users, your feedback is invaluable so please keep sending it. Here are the new features and noteworthy improvements:

Codeshare without calling - You can now start sharing code with a teammate without getting on a call first.
View a teammate's pushed changes - You can now choose to see the changes your teammates have pushed in addition to their local changes in the GitLive window.
OS-level calling notifications - Never miss a call again with push notifications when you receive a call from a teammate.
Choose where to branch from when starting a new issue - You can see which branch is already connected to an issue or choose which branch to use as a starting point for a new issue when selecting an issue to work on.

Install the latest GitLive VS Code extension or JetBrains plugin to get started.

Codeshare without calling

In those cases you are already on a call or in a meeting with your teammate via Zoom, Slack, Teams, etc. you can now start a codeshare session without having to place a call.

You can find the direct codeshare button next to the call icon in the GitLive window.

VS Code	JetBrains

You can also choose to codeshare through the command palette (VS Code) or through the "Search Everywhere" list (JetBrains).

VS Code	JetBrains

Note the option will be disabled for teammates that have not yet updated to the latest version of GitLive. After you select "share" your teammate will receive a notification in their editor, asking them to accept or decline the invitation to codeshare.

VS Code	JetBrains

Once accepted the session will begin! Learn more about real-time editing in GitLive.

View a teammate’s pushed changes

We've always shown your teammate's unpushed changes in the GitLive window, which you won't find anywhere else, such as GitHub. But it can also be useful to see all changes on a teammate's branch compared to the default branch, like you do on a pull request on GitHub for example.

So now, by default, we show both pushed and unpushed changes in the tree. If a file contains unpushed changes it will show as modified (white dot beside the name in VS Code, asterisk on the icon in JetBrains).

VS Code	JetBrains

To see only unpushed changes in the tree like before (or even to see only pushed changes), you can change the view filters, which appear as a filter icon in VS Code, and as an eye icon in JetBrains.

VS Code	JetBrains

When viewing a diff of a file it will also only show pushed or unpushed changes depending on the view filters you selected. You can also change the view filter for diffs independently of the tree, using the view filter on the right-hand side.

VS Code	JetBrains

OS-level calling notifications

As the calling notifications in the IDE can be quite hard to notice, you can now enable OS-level notifications via your browser. Next time you answer a call, your browser should prompt you to enable push notifications for GitLive. Once enabled you will receive notifications for incoming calls inside your IDE (if open) and also at the OS-level. Clicking on the OS-level notifications will answer the call directly.

Mac	Linux

Learn more about calling in GitLive.

Choose where to branch from when starting a new issue

Before, when selecting an issue to work on in GitLive, a feature branch named after that issue automatically gets created (if it does not already exist) and checked out from the default branch.

We have updated this functionality so you can now choose which branch to use as a starting point for a new issue when selecting an issue.

VS Code	JetBrains

And for existing issues that are already associated with a branch you will now see the name of the connected branch in the issue selector.

VS Code

JetBrains

Learn more about issue tracking in GitLive.

That's it for now, we would love to know what you think of these updates and how we can make GitLive better for you, so please reach out via the comments section below.