This content originally appeared on DEV Community 👩💻👨💻 and was authored by Agnieszka Stec
Get the ultimate perspective on all the work in progress in your repository and how it compares or possibly conflicts with the changes you are making on your own branch with GitLive’s new Repository View 🚀
The repository view shows all branches ahead, in terms of commits, of your current branch and the changes on those branches, grouped by author.
GitLive performs what is known as a three dot diff between your local HEAD (on the left), and the heads of all the remote branches in your repository (on the right), to populate the tree in the repository view.
This shows you all the changes between the common ancestor of your current branch and each remote branch, similar to what you would see in a PR on GitHub.
Know when your branch falls behind
When the default branch or your remote tracking branch is ahead of your current branch they show at the top level of the tree.
As you can see, these let you know how many changed files you need to pull, and as you probably already know, it’s good Git hygiene to pull these changes sooner rather than later!
Sharing working tree changes
With GitLive you can see the unpushed changes from local clones of your repository when you have signed in and you and your fellow contributors have chosen to share working tree changes.
As mentioned above, GitLive performs what is known as a three dot diff between your local HEAD (on the left), and the heads of all the remote branches in your repository (on the right).
You can customize this diffing process by changing what is used as the left and right sides in the diff via the view options in the tool window toolbar in IntelliJ.
The options available for left and right in the tree are the following:
| Left | Right |
|---|---|
|
Common ancestor. Selecting this for the left will include all changes pushed to the remote in the diff of the branch. Their remote branch. Selecting this for the left will exclude all changes pushed to the remote in the diff of the branch. |
Their remote branch. Selecting this for the right will exclude any local changes not yet pushed to the remote in the diff of the branch. Their working tree. Selecting this for the right will include any local changes not yet pushed to the remote in the diff of the branch. |
An asterisk appears on the icon of any branch or file with working tree changes and it’s possible to see the same branch multiple times in the tree if multiple clones exist.
Switching between repositories in your workspace
Use the team selector to switch to a different repository view if your project or workspaces comprises more than a single repository.
The popup lists all the organizations and repositories found via the remotes of the local clones in your project or workspace.
Finally, you can also select the owner of the repository to show the organization view. It lists all the branches ahead of the default branch, grouped by author, for every repository in your organization.
It's great to review all work in progress across your whole organization but depending on the size that can be a lot of information!
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.
This content originally appeared on DEV Community 👩💻👨💻 and was authored by Agnieszka Stec
Agnieszka Stec | Sciencx (2022-11-17T16:14:25+00:00) See How Others’ Changes Compare To Your Own In IntelliJ. Retrieved from https://www.scien.cx/2022/11/17/see-how-others-changes-compare-to-your-own-in-intellij/
Please log in to upload a file.
There are no updates yet.
Click the Upload button above to add an update.