DEV Community: Michael

Get notified when there are commits to pull in VS Code

Michael — Tue, 17 Jan 2023 00:39:59 +0000

With the help of GitLive’s new pull reminders, you can now pull sooner, reduce the chances of conflicts, and merge faster!

Get notified the moment your remote has been updated and there are commits to pull from your tracking branch.

We'll even notify you on falling behind your base branch (the branch you plan to merge your changes back into once you're done), we figure out your base branch by checking the git reflog to see which branch you originally branched off when you created your current branch.

It's not always possible to tell where you branched from in the local reflog, in these cases we'll assume it was your default branch if possible, otherwise, we'll just ask you to pick one. In any case, you can easily change the base branch by clicking Change base on the notification.

You can also select No base branch to suppress notifications for your root branch (typically your main/trunk branch). Once the relationship between your branches is correctly set, you'll be notified when you are behind any branch in the chain of bases up to your root branch.

^{💡 Example: If you follow a GitFlow style branching strategy with main and develop branches, and your current feature branch was branched off develop, you'll not only be notified if your branch is behind develop but also if develop is behind master.}

Finally, you can click Show changes on the notification to open the repository view where you can inspect the changes in the branches you are behind.

The repository view also shows all the remote feature branches ahead, in terms of commits, of your current branch, check out this article to learn more:

See how others' changes compare to your own in VS Code

Agnieszka Stec for GitLive ・ Nov 1 '22

#vscode #devops #productivity #programming

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

Early Merge Conflict Detection Across All Branches In IntelliJ

Michael — Tue, 12 Jul 2022 14:44:10 +0000

We are happy to announce that GitLive's flagship feature, early merge conflict detection, now works across all branches in IntelliJ! 🎉

When we first introduced real-time merge conflict detection, only the changes from each of your teammates’ current branch were shown in the gutter. This meant you could miss a merge conflict from changes in a branch that is not currently being worked on, for instance, changes from a PR waiting for review. Now the change indicators in the gutter of the editor show changes from all branches that contain changes compared to your current branch.

And, as before, and as long as you are not in offline mode, this includes the unpushed changes of your teammates that are also not in offline mode for real-time, instant merge conflict detection!

New gutter indicator filters

Previously you had a simple switch to show or hide the indicators you see in the gutter of the editor. Now, similar to the team window, you can filter the change indicators shown in the gutter of your editor by type.

It’s worth noting that these filters are independent of the team window filters, but when you change the team window filters the gutter indicator filters are automatically updated to match (but not vice versa). To open the gutter filters menu, right-click on the gutter and search for GitLive in the collapsible menu.

🔸 Pushed Changes. Turning off pushed changes will hide the indicators coming from the pushed changes on other branches.
🔸 Unpushed Changes. Turning off unpushed changes will hide the indicators coming from the unpushed changes of your teammates.
🔸 Non-conflicting changes. On by default, turn off non-conflicting changes to only show conflicts in the gutter.
🔸 Include stale changes. By default, changes from branches that have not been modified in 3 months are hidden, turn this on to show them.

👉 ^{Both pushed and unpushed changes are on by default, turn both off to hide the indicators completely}

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.

Don't have the GitLive extension installed yet? You can find it here, and if want to learn more about the latest release, check out this blog post.

GitLive Now Works With Any Git Repository in IntelliJ!

Michael — Mon, 04 Apr 2022 08:54:29 +0000

We are happy to announce GitLive now works, out-of-the-box in offline mode, with any Git repository in IntelliJ!

Previously we only supported repositories from the big four hosting services (GitHub, GitLab, Bitbucket, Azure DevOps) and required you to authorize access to the service before you could start using GitLive.

Now when you install GitLive it will start in offline mode. The offline mode uses the data from your local Git repository only and nothing is sent outside your network. Your repository should have a remote but it can be hosted anywhere.

In the GitLive tool window you'll see all the authors of branches currently ahead of your default branch, the last commit to a branch determines who it will appear under.

Drill down into an individual author’s branches to see the files changed and inspect diffs plus view the associated issue or pull request.

The changes from the branches shown in the GitLive tool window also appear for your current file in the gutter of your editor. The gutter indicators show the differences in the file from other branches compared to your local version. It even shows you when the changes conflict with your own - a kind of early warning system for merge conflicts!

Click on the author's avatar to inspect a change and see the diff, what branch they're from and even cherry-pick changes straight into your local file.

And you can still sign in to go real-time and see your teammate's unpushed changes in the team window, get notified in the gutter the moment you make a conflicting change, plus make calls and codeshare to edit together simultaneously.

Signing in still requires a repository from the big four hosting services for now but we'll be adding support for other services, including self-hosted, soon!

Don't have the GitLive plugin installed yet? You can find it here, and if want to learn more about the latest release, check out this blog post.

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

Michael — Tue, 14 Dec 2021 09:06:36 +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 Android Studio, 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 See Which Branch Your Teammate Is On In Android Studio

Michael — Fri, 08 Oct 2021 13:41:18 +0000

“What branch are you on?” is often the first question you ask when a teammate says “The tests aren't passing” or “The build failed”. Here’s how you can get an answer to that question without even needing to ask.

In Android Studio, open up the Team Window by clicking GitLive 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. Locate the teammate you are interested in and click the arrow on the left-hand side of their avatar.

Now you will see all the repositories they have cloned including the name of their current branch!

NOTE: If an issue has been connected to the branch you’ll see the issue name instead, if that's the case just hover your cursor over the issue name and a tooltip will appear showing you the branch name (and even the commit hash)

Don't have the GitLive extension installed yet? You can find GitLive here and, if you need help setting it up, follow the instructions in GitLive docs.

How To Enable Real-Time Merge Conflict Detection in IntelliJ

Michael — Mon, 23 Aug 2021 11:52:16 +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 IntelliJ user today is your lucky day!

Firstly, you'll need to install and set up GitLive. Then if you right click the gutter on IntelliJ, 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 See Which Branch Your Teammate is on in IntelliJ

Michael — Fri, 23 Jul 2021 12:32:29 +0000

In IntelliJ, open up the Team Window by clicking GitLive on the bottom tool window bar.

Now you will see all the repositories they have cloned including the name of their current branch!

NOTE: If an issue has been connected to the branch you’ll see the issue name instead, if that's the case just hover your cursor over the issue name and a tooltip will appear showing you the branch name (and even the commit hash)

Don’t have the GitLive extension installed yet? You can find it here and, if you need help setting it up, follow the instructions here.