On project nodes in navigation views (Navigator, Package Explorer etc.) the following
+ Git actions are available for projects shared with the Git team provider:
+
+
+
+
+ main project menu
+
+
+
+
+
+ "Remote" sub-menu
+
+
+
+
+
+ "Switch To" sub-menu
+
+
+
+
+
+ "Advanced" sub-menu
+
+
+
+
+
+
+
+
Resource Context Menu
+
On resource nodes (files and folders) in navigation views the following Git actions are available for projects shared with the Git team provider:
+
+
+
+
+
Repositories View Menus
+
In the Repositories View the menu depends on the node type which is selected
+
+
+
+
+
Menu on repository nodes:
+
+
+
+
+
Menu on branch nodes:
+
+
+
+
+
Menu on tag nodes:
+
+
+
+
+
Menu on Reference nodes:
+
+
+
+
+
Menu on Remote nodes:
+
+
+
+
+
Menu on Fetch Configuration nodes:
+
+
+
+
+
Menu on Push Configuration nodes:
+
+
+
+
+
Menu on Working Tree nodes:
+
+
+
+
+
History View Menus
+
Menu on entries in the History View's commit list
+
+
+
+
Menu entries in the History View's Quickdiff sub menu
+
+
+
+
Git Workbench Toolbar and Git Workbench Menu
+
In order to ease use of the most frequently used Git actions the
+ Git Command Group can be activated to show a Git Workbench Toolbar and/or Menu
+
+
+
Click
+ Window > Customize perspective...
+
+
in the tab
+ Command Groups Availability click
+ Git, this will enable both the Git workbench toolbar and menu
+
+
in the tabs
+ Toolbar Visibility and
+ Menu Visibility you may configure which actions should appear in the Git Workbench toolbar and menu
+
+ Assume unchanged - Resources can be flagged "assume unchanged". This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. This setting can be switched on with the menu action
+ Team > Assume unchanged and switched back with the menu action
+ Team > No Assume unchanged.
+
+ Disconnect - Disconnect the attached Git Team Provider from this project. The git repository still exists but is no longer integrated with Eclipse.
+
+
+ Ignore - Add files to .gitignore so that git ignores them.
+
+
+ Import Projects - Import projects into the Eclipse workbench.
+
+ Untrack - Remove resources from git version control. If you want to delete the resource from the working tree click also
+ Delete in the resource's context menu.
+
+
+
+
+
+
Git Perspective and Views
+
Git Perspective
+
+ Window > Open Perspective > Git Repository Exploring opens the Git Repository Exploring perspective
+
+
Git Repositories View
+
+ Window > Open View > Git > Git Repositories opens the Git Repositories view which is explained in detail
+ here.
+
+
History View
+
Overview
+
The History View for Resources under Git version control is a commit-centric view of the resources in a given Repository. It can be used to perform the following tasks:
+
+
Inspecting the change history of a given File under Git version control (viewing and comparing the versions of such a File in the Repository)
+
Search for a certain commit using different search criteria
+
Check-out of a certain commit
+
Creation of branches and tags based on a certain commit
+
Creation of patches based on the changes in a certain commit
+
Resetting the complete Repository to a certain commit
+
Setting and resetting of the quickdiff baseline to a certain commit
+
+
Opening the History View
+
The History view can be opened by
+
+
Right-clicking
+ Show In > History View on any resource under Git version control in the explorer (not available in all Perspectives)
+
+
Right-clicking
+ Team > Show in History on any resource under Git version control in the explorer
+
+
Clicking
+ Window > Show View > Other..., then
+ Team > History
+
+
+
Once the view is open, you can activate the
+ Link with Selection button to keep the input of the view in sync with the selection in the explorer automatically.
+
+
Organization of the History View
+
The History view is organized in several panes:
+
+
+
+
The upper pane is the Commit Graph displaying the commit log (or commit history) in reverse chronological order (newest commit on top). Below the commit graph, there are by default two panes: on the left side, the Revision Comment area, which shows the commit message and a textual Diff of the file or files in the commit, and on the right side, the Revision Detail area, which shows a table of the files that were changed by the commit.
+
The first column of this table describes the nature of the change for each file:
+
+
+ ADD the file was added by the commit
+
+
+ MODIFY the file was modified by the commit
+
+
+ DELETE the file was deleted by the commit
+
+
+
The content of the lower panes depends on the selection in the upper pane and is updated automatically when this selection changes.
+
Both lower panes can be switched on and off separately by right-clicking anywhere in the upper pane and selecting
+ Show Revision Comment and
+ Show Revision Details, respectively.
+
+
Above the Commit Graph, the current input is visualized. The input is always a workspace resource, either a project, a folder, or a file. After the type of the input, the path is shown, followed by the name of the Repository containing the resource in square brackets.
+
Using the History View
+
Inspecting the Commit Graph
+
The Commit Graph area is the main part of the History View. By default, it shows the currently checked out commit and all its ancestors, i.e. the first entry in the list is the checked out commit.
+ The following picture is used to explain some of the features of the History View:
+
+
+
+
Each line in the Commit Graph corresponds to a commit. Branches, tags and HEAD are visualized as follows:
+
+
The tips of local branches are shown as green rectangles
+
The tips of remote branches are shown as grey rectangles
+
The local HEAD is shown as a white rectangle
+
Tags are shown as yellow rectangles
+
+
(our example doesn't have remote branches).
+
The line on the left side is the actual commit graph, which shows the parent-child relation of the commits in the list (each commit has at least one parent, except for the very first commit in a Repository).
+ There can be forks, which correspond to a branch operation, and joins, which correspond to a merge operation. In our example, there was a branch "experimental" created after the commit with branch "beforeSplit", and the same file was changed both in the "master" and in the "experimental" branch. The last commit is a merge commit where the content of the "experimental" branch was merged with the "master" branch.
+
The exact change can be inspected by marking a commit and looking at the Revision Comment area. When scrolling down in the Revision Comment area, a textual diff for the changes will be visible, in our example it says that the content of Project1/f1/file1.txt was changed from "modified" to "modified in master". When selecting the next commit (which corresponds to the "experimental" branch), a similar diff would be displayed, saying that the content of that file was changed from "modified" to "modified in experimental". The newest commit is the result of merging "experimental" into "master". Accordingly, the new commit has two ancestors and the "master" and "experimental" lines are joined again.
+
Displaying and Comparing versions of a File
+
If the current input is already a file, right-clicking
+ Open on a commit will open an editor with the file content corresponding to the currently selected commit. If the file does not exist in the selected commit, an error message will be displayed. Clicking
+ Compare with working tree will open a compare editor comparing the file content of the currently selected commit with the file content in the workspace.
+
+
+
+
+
The
+ Open and
+ Compare with working tree actions can also be executed by double-clicking on a commit: if the "Compare Mode" toolbar button (see below) is down,
+ Compare with working tree will be executed, otherwise
+ Open.
+
+
It is possible to compare the contents of two commits filtered by the current input by selecting the two commits and right-clicking on
+ Compare with each other. If the current input is not a file, there is an additional menu action
+ Compare with each other in Tree. The first action opens an Eclipse compare editor, the second opens the
+ Git Tree Compare View.
+
+
Furthermore, it is possible to select any number of commits and right-click
+ Open to see all versions of the file corresponding to the selected commits (one editor will be opened per version).
+
+
If the current input is not a file, then there won't be menu actions for
+ Open. However, it is possible to double-click on an entry the Revision Detail area. If compare mode is active, a compare editor will be opened showing the changes for the file being double-clicked in the currently selected commit (i.e. a diff of the file content in the currently selected commit against the file content of this commit's ancestor). If compare mode is not active, an editor with the file content corresponding to the currently selected commit is shown.
+
+
+
+
+
Working with the Filter Settings
+
The filter settings can be changed using the corresponding toolbar actions (see below). By default, the "Resource" setting is active, i.e. only those commits are shown in the list that contain changes for the current input. If the current input is not a file, all commits are shown that contain changes for any child of the current input.
+
If the filter setting is "Resource" and the current input is a file, then the list of commits contains only those commits that contain changes for that file. This is useful when analyzing the history of that file. In some cases, however, it is helpful to also see other commits which do not change the actual file. For example, it may be interesting to see whether a given change in the file was before or after some other commit which does not change that file itself. In our example, we might want to know whether a given change was "before" or "after" the commit tagged as "Project1". By changing the filter setting from "Resource" to "Repository", this is easily done:
+
+
+
+
The behavior of the other two settings ("Folder" and "Project") is similar in that they include the commits that change any resource in the parent folder of the current input or any resource in the project of the current input, respectively. In our example above, if filter setting "Project" would be used, the commit "Add Project2 to Repository" would not be shown, is it doesn't change anything in the project of the current input (Project1/f1/file1.txt).
+
Alternatively, in order to see all commits pertaining to a specific project, one could change the history view input to that project. However, the file-specific menu actions would then not be available.
+
Toolbar actions
+
The first four buttons in the History View's toolbar are the standard buttons for Refresh, Link with Selection, Pinning and Navigation History.
+
Find
+
If the "Find" toolbar button is down, a search bar is displayed in the lower part of the view which allows to search for commits in the commit log. Depending on the setting in the drop-down list in the search bar the commit's title, comment, author or committer are searched.
+
The found search hits are high-lighted in bold and the "Next" and "Previous" buttons allow to jump to the next or previous commit matching the search criteria:
+
+
+
+
Filter settings
+
The next four toggle buttons in the view toolbar control how the displayed commits are filtered with respect to the current input:
+
+
+
+
+ The buttons are working as radio buttons, i.e. one of the four buttons must always be down.
+
+
+
If the "Repository" button is down, the commit log is not filtered and shows all commits reachable from the currently checked out branch (or all commits, see below about the "All Branches" action)
+
+
+
If the "Project" button is down, the commit log is filtered to show all commits which affected any of the resources in the project containing the current input
+
+
+
If the "Folder" toggle is down, the commit log is filtered to show all commits which affected any of the resources in the parent folder of the current input
+
+
+
If the "Resource" button is down, the commit log is filtered to show only commits which affected the current input; the view menu item
+ Show > Follow Renames allows to toggle whether renames of the selected resource should be followed by this filter
+
+
+
Note that not all combinations of filter setting and current input are meaningful; for example, if the current input is a project, the "Project" option is in fact the same as the "Resource" option.
+
Compare Mode
+
+
+
+
The next button is again a toggle, activating "Compare Mode". If it is down, certain double-click actions (see above) will open a compare editor instead of a normal editor.
+
All Branches
+
+
+
+
This toggle activates the "All Branches" mode. By default, only those commits are shown in the commit log that can be reached from the currently checked out commit, i.e. the Commit Graph ends with the currently checked out commit and newer commits are not shown. If this button is down, all commits will be shown in the commit log. This is illustrated in the following picture from our example. The branch "beforeSplit" is currently checked out; by activating the toggle, the newer branches will become visible:
+
+
+
+
View Menu actions
+
Configuring the View
+
Most of the toolbar actions are available in the View Menu, too. In addition, the following toggles are available:
+
+
+
+
and the Filter submenu allows to configure filter settings
+
+
+
+
"Additional Refs" toggles the visibility of certain Refs created during actions like fetch, rebase, merge, for example FETCH_HEAD, ORIGIN_HEAD... This can be helpful to remove clutter from the history view.
+
"Notes History" toggles the displaying of Gerrit's review notes branch/ref in the History view
+
"Follow Renames" toggles whether renames of a selected resource should be followed in the History View, if the "Resource" filter is used.
+ This preference can also be configured in the preference wizard
+ Preferences > Team > Git > History > Follow Renames.
+
+
"Revision Comment" toggles the visiblity of the Revision Comment area.
+
"Revision Details" toggles the visibility of the Revision Detail area.
+
If "Relative Dates" is checked, the commit dates are shown as relative dates instead of absolute dates.
+
"E-mail Adresses" toggles the display of committer e-mails.
+
The sub-menu "In Revision Comment" opens a sub-menu with some more toggles that govern the appearance of the Revision Comment area:
+
"Tag sequence" allows to show/hide a couple of lines indicating the last tag in the list of ancestors of the given commit and the next tag in the list of successors of the given commit, i.e. the tags preceding/following the given commit.
+
The "Wrap Comments" and "Fill paragraphs" toggles govern the formatting within the Revision Comment area.
+
"Revision Details" and "Revision Comments" are also available by right-clicking anywhere in the Commit Graph area.
+
"Tag sequence", "Wrap Comments" and "Fill paragraphs" are also available by right-clicking anywhere in the Revision Comment area.
+
Context Menu actions
+
The context menu in the Commit Graph area is slightly different, depending on whether the current is a File or a Folder/Project, respectively. The following menu entries are always available:
+
+
+
+
If the current input is a File, there are some other actions available; if exactly one commit is selected, there are three additional options:
+
+
+
+
and if exactly two commits are selected, the menu will appear like this:
+
+
+
+
If more than two commits are selected, only the "Open" action and the "Quickdiff" menu will be available.
+
Compare with working tree
+
This action is only available if the current input is a file and a single commit is selected. It will open a compare editor comparing the file content of the selected commit with the file content in the working tree.
+
Compare with each other
+
This action is only available if the current input is a file and exactly two commits are selected. It will open a compare editor comparing the file content of the selected commits with each other.
+
Open
+
This action is only available if the current input is a file. It will open an editor for each selected commit displaying the content of the file for the given commit.
+
Checkout
+
This checks out the currently selected commit. If a branch exists for this commit, the branch is checked out, if more than one branch exists for this commit, a dialog will be shown asking which branch should be checked out. If no branches exist for the commit, the commit will be checked out and
+ HEAD will become detached.
+
+
Create Branch...
+
Creates a branch on the currently selected commit. A dialog will be shown asking for a branch name and whether the newly created branch should be checked out.
+
Delete Branch
+
This action will be enabled if a branch exists for the currently selected commit, which is not checked out. If there is a single branch on this commit, which is not checked out, this action will delete this branch immediately. If multiple such branches exist, a dialog will be shown asking which branches should be deleted. If commits become unreachable on "Delete Branch" a confirmation dialog will be shown to prevent accidental unreachability of commits.
+
Create Tag...
+
Creates a tag on the currently selected commit. A dialog will be shown asking for a tag name and a tag message.
+
Create Patch...
+
This action is not available on the very first commit of a Repository. It will create a patch containing the changes of the currently selected commit compared to that commit's predecessor. A dialog will be shown asking whether the patch should be created as file or in the clipboard and whether to use the Git patch format of the generic patch format.
+
Cherry Pick
+
Applies the change introduced by the selected commit on top of the currently checked out commit.
+
Revert Commit
+
Reverts the changes that the selected commit introduces by creating a new commit on top of the currently checked out commit.
+
Merge
+
Merges the selected commit into the currently checked out branch.
+
Rebase on top of
+
Rebases the currently checked out branch on top of the selected commit.
+
Reset > Soft/Mixed/Hard
+
This action resets the Repository containing the current input to the currently selected commit. Depending on the choice of the sub-menu, a soft, mixed, or hard reset will be performed.
+
Quickdiff > Reset Quickdiff Basline to HEAD
+
Quickdiff > Reset Quickdiff Basline to first parent of HEAD
+
These two actions set the quickdiff basline for the repository to HEAD or to the parent of HEAD. These actions are always available, even if more than one commit is selected.
+
Quickdiff > Set as Baseline
+
This action is only available if a single commit is selected; it will st the quickdiff baseline for the repository to the selected commit.
+
Copy
+
Copies the IDs of the currently selected commit or commits into the clipboard.
+
Show Revision Comment
+
Toggles the visibility of the Revision Comment area.
+
Show Revision Details
+
Toggles the visibility of the Revision Details area.
+
Wrap Comments
+
Only available when right-clicking on the Revision Comment area. If active, the comments will be auto-wrapped to fill the display area, otherwise the wrapping of the commit message will be used.
+
Fill Paragraphs
+
Only available when right-clicking on the Revision Comment area. If active, the commit message will be displayed without unnecessary line breaks.
+
+
+
+
Drag and Drop Support
+
You may drag and drop commits from the commit graph either onto a
+ Mylyn Task or into a folder on your harddisk. In both cases, EGit will automatically create a patch you may attach to a bug or store on disk.
+
+
Working with the Revision Details Area
+
The Revision Details Area shows a table of the files that were changed by the selected commit. Selecting the context menu action
+ Show Annotations on selected files will open the file in a (read-only) editor and display an annotation ruler with commit and author information for each line in a file. See
+ this section.
+
+
Synchronize View
+
The menu command
+ Team > Synchronize Workspace will launch the Synchronize View. This view allows you to inspect the differences between the resources in the local workspace and a local or remote tracking branch. Alternatively you may compare a local and a remote tracking branch. Comparison of two remote tracking branches as well as menu commands on the Synchronize View are not yet available in this EGit version and will be provided in a future release.
+
+
Here is what the Git Synchronize View looks like:
+
+
+
+
Synchronization State
+
The Synchronize View shows the synchronization state of resources in your workspace or a local branch compared to those in another local or remote tracking branch representing the state of a branch from a remote repository. This state is shown by using icons and can also be configured to show the state as text appended to the resource name.
+
+
+
+
A description of the icons is shown in the table below:
+
+
+
Icon
+
Description
+
+
+
+
+
+
An incoming addition means that a resource has been added to the target branch.
+
+
+
+
+
+
An incoming change means that the file has changed in the target branch.
+
+
+
+
+
+
An incoming deletion means that a resource was deleted from the target branch.
+
+
+
+
+
+
An outgoing addition means that the file was added to your workspace or source branch and is not yet in the target branch.
+
+
+
+
+
+
An outgoing change means that the file was changed in your workspace or source branch.
+
+
+
+
+
+
An outgoing deletion is a resource that has been deleted in your workspace or source branch.
+
+
+
+
+
+
A conflicting addition means that the resource has been added in your workspace or source branch and in the target branch.
+
+
+
+
+
+
A conflicting change means that the file has been changed in your workspace or local branch and in the target branch. A manual or automatic merge will be required. Also, any entries in the view that contain children that are conflicts will also be decorated with the conflict icon. This is done to make conflicts easy to find.
+
+
+
+
+
+
A conflicting deletion means that the resource was deleted in your workspace or source branch and in the target branch.
+
+
+
Mode
+
The Synchronize View can be filtered using modes using either the toolbar actions or the menu items in the view's drop down menu. Modes can be used to show only incoming, outgoing or conflicting changes.
+
+
+
+
Models
+
The Synchronize View is capable of displaying different model representations of the resources. Each product may contain its own product specific representations. The Eclipse SDK comes with three models:
+
+
Workspace Model: displays a resource based model. Layout options for this model can be controlled from the Preferences dialog in the drop down menu. The layout options for the Workspace model are
+
+
Flat layout: shows all the out-of-sync resources as direct children of their project.
+
Tree layout: shows the resource hierarchy as it is shown in the Project Explorer.
+
Compress Folders: shows changes grouped by project and then by folder. This results in a hierarchy that is at most three levels deep with folder paths being compressed into a single level (similar to a Java package).
+
+
+
Java Model: displays a Java based model (similar to what appears in the Package Explorer).
+
Git Commits: displays a Git Commit based model. This model shows incoming changes grouped by commit which is handy for seeing who released what and why. For outgoing changes, you can create commits by
+ creating commits. The display format of the Git commit description can be configured in the preferences under
+ Team > Git > Label Decorations in the tab
+ Other.
+
+
+
In addition to to the models, there is also a
+ Flat Presentation which displays all the out-of-sync elements as top level elements.
+
+
Navigation
+
The Synchronize view provides toolbar actions for navigating through the changes in the view. These actions not only navigate between files but also go from change to change within a file.
+
+
+
+
The tree in the Synchronize View can easily be expanded and collapsed from the tool bar.
+
+
+
+
+
+
+
Git Tree Compare View
+
This view will be opened by some of the
+ Compare With actions (see
+ Comparing Content). When started from a resource (e.g. a project or folder), it will look similar to the resources in the workspace. However, the usual icons on the files will be replaced with icons showing the change state (added, deleted, changed, or unchanged).
+
+
The changes can be browsed and a double-click on a file will open a compare editor for this file (this only makes sense on "changed" files, in case of added or deleted files, one side of the compare editor will be empty, whereas unchanged files will show the same content on both sides of the editor):
+
+
+
+
It is possible to hide unchanged files by clicking the "Hide files with equal content" button in the toolbar.
+
The Git Tree Compare View can also be started without having workspace resources as starting point (for example by comparing two commits in the history view when the input of the history view is a Repository and not a workspace resource). In this case, the complete content of the Repository is shown and both projects and folders appear as simple "folder" icons:
+
+
+
+
Git Staging View
+
+
+
+
This view provides an equivalent for git status showing changes made in the working tree. Unstaged changes which have not yet been transferred to the git index are displayed in the
+ Unstaged Changes pane, changes which have already been "added" (staged) to the Git index are shown in the
+ Staged Changes pane. By default these panes are displayed in a row layout, which can be changed to a column layout by the
+ Column Layout option. The Staged- and Unstaged Changes panes by default show the full path of the files. They can be configured by the
+ Show File Names First option to show the file names first, followed by the directory that the files are located in.
+
+
Double-click modified files to open a compare view. If fired from the "unstaged" pane the compare view will show the not-yet staged changes. When fired from the "staged" pane it will display the already staged changes. To open a file in the editor, use the
+ Open Workspace Version action on the file's context menu.
+
+
To stage a file, drag it from the
+ Unstaged Changes pane to the
+ Staged Pages pane. Alternatively, use the
+ Add to Git Index action on the file's context menu in the
+ Unstaged Changes pane. The
+ Replace with File in Git Index action will replace the selected file in the working tree. If the file is unstaged, it will be reset. If it is staged, the working tree version will be replaced with the staged version from the Git index.
+
+
To unstage a file, drag it from the
+ Staged Changes pane to the
+ Unstaged Changes pane. Alternatively, use the
+ Remove from Git Index action on the file's context menu.
+
+
The commit action will commit the staged changes only -- similar to what git commit does in native git. An integrated commit message editor allows to edit the commit message for the commit. In contrast to the commit dialog, the staging view can be kept open while doing changes. This allows for incrementally writing the commit message along with the changes. The commit message being edited is associated with the repository, the staging view is linked with. It is not stored persistently and will get lost if the staging view or Eclipse are closed.
+
To commit, press
+ Ctrl+Enter (
+ Command+Enter on Mac OS X) in the commit message text field, or click on the
+ Commit or
+ Commit and Push button.
+
+
The Staging View's view menu allows to configure the Staging View
+
+
+
+
If you are working on a large change and many files are displayed in the Staging View you may use the "Filter Files" filter field which will filter the content of the Staging View to only show the files matching the filter you entered.
+
+
+
+
Partial Staging
+
Sometimes it's useful to commit only some changes of a file. An example is when working on a feature and noticing a typo or small bug, which is unrelated to the feature.
+
To commit only certain changes, these changes have to be staged first. To do this, double-click on the file in the
+ Unstaged Changes pane. This will open the compare editor. On the left side is the workspace version, on the right is the index (staged) version.
+
+
Both sides of the compare editor are editable. When changing something in the right side (index) and saving, the file will turn up in the
+ Staged Changes pane and when committing, exactly that content will be committed.
+
+
To stage a group of changed lines, the
+ Copy Current Change from Left to Right toolbar button (arrow icon) can be used.
+
+
Git Reflog View
+
+
+
+
The Reflog View shows the Git reflog for a selected repository. It supports showing the reflog for a specific branch by selecting the hyperlink ref name in the top right of the view. Double-clicking or selecting the context menu action
+ Open in Commit Viewer on a reflog entry opens the corresponding commit in the commit viewer. The context menu action
+ Checkout will checkout the selected commit and the
+ HEAD will become detached.
+
+
Git URLs
+
Git URLs in general consist of transport protocol scheme, address of the remote server and the repository path within the remote server and for some authenticating protocols also the user ID.
+
EGit supports the following protocols
+
+
+ file - Direct file system access to the repository.
+
+
+ git - The most efficient built-in git protocol (default port 9418). This protocol doesn't provide authentication. Typically used for anonymous read access to the repository.
+
+
+ ssh - Git over
+ secure shell (SSH) protocol. Typically used for authenticated write access to the repository.
+
EGit provides two ways to connect to http or https URLs:
+
+
via the Java built-in http(s) implementation, or
+
via the Apache httpclient Java library.
+
+
The user can choose between these two in the main Git preferences. The default is to use the Apache httpclient library.
+
Using the Apache httpclient library, it is possible to connect to a https git URL via an http proxy. The Java built-in http support does not allow this.
+
EGit supports the BASIC, DIGEST, and NEGOTIATION (Kerberos) authentication schemes. (Kerberos needs non-trivial setup for the JDK/JRE outside of EGit, though; if you work in an environment where this is used, your system administrator should have done all the necessary things already.)
+
Some git servers, most notably Microsoft TFS and its successors, are sometimes configured to require NTLM authentication. EGit does not support this proprietary authentication scheme. If you need NTLM authentication, try choosing the Java built-in http support, and set the Java system property -Djdk.http.ntlm.transparentAuth=allHosts. One way to set this system property for Eclipse is to include it in the eclipse.ini file.
+
SSH connections
+
By default EGit uses the Apache MINA sshd Java library for SSH connections. If environment variable GIT_SSH is set, it should be the path of an SSH executable on your system, and EGit will use that instead of its built-in Java SSH client.
+
The Java SSH client tries to be as compliant to OpenSSH as possible. A few differences exist in the handling of the SSH configuration file ~/.ssh/config, though; in particular, the Match and Include directives are not supported. ProxyCommand is not supported, but ProxyJump is. GlobalKnownHostsFile is ignored.
+
Eclipse lets the user define the SSH_HOME directory in the preferences under
+ Preferences→General→Network Connections→SSH2, field "SSH2 home". Setting this to anything else but .ssh in your user home directory is going to be confusing, since it'll mean that EGit may use other settings than your command-line utilities. It is
+ strongly recommended to set this path to .ssh in your user home directory.
+
+
Git References
+
Git References are also known shortly as
+ Refs.
+ They comprise
+
+
+
branches
+
remote-tracking branches
+
tags
+
+
They all are named with a path using '/' as path separator and are starting with "refs".
+
+
Local branches start with "refs/heads/"
+
Remote tracking branches start with "refs/remotes/". Remote tracking branches proxy branches located in a remote repository so that their state at the time of the last transport operation can be queried also when no connection to the repository is available (offline).
+
Tags start with "refs/tags/"
+
+
Ref names can be abbreviated as long as the abbreviated form is unique.
+ E.g.
+
+
+
"master" is short for "refs/heads/master"
+
"origin/master" is short for "refs/remotes/origin/master"
+
"v1.0.1" is short for "refs/tags/v1.0.1"
+
+
There is also a number of "reserved" names for Refs that are useful for certain scenarios:
+
+
+
+ Ref Name
+
+
+ Remark
+
+
+
+
HEAD
+
Points to the currently checkout out commit
+
+
+
FETCH_HEAD
+
Points to the result of the last fetch operation
+
+
+
ORIG_HEAD
+
Points to the commit that was checked out before a merge or rebase operation was started
+
+
+
For a complete list for Ref names and the order of precedence if multiple references have the same shorthand form see the section "Specifying Revisions" section of
+ git rev-parse.
+
+
Refspecs
+
A "refspec" is used by fetch and push operations to describe the mapping between remote
+ Ref and local
+ Ref. Semantically they define how local branches or tags are mapped to branches or tags in a remote repository. In native git they are combined with a colon in the format <src>:<dst>, preceded by an optional plus sign, + to denote forced update. In EGit they can be displayed and also edited in tabular form in the
+ Push Ref Specification and the
+ Fetch Ref Specification and other dialogs.
+
+
The "left-hand" side of a RefSpec is called source and the "right-hand" side is called destination. Depending on whether the RefSpec is used for fetch or for push, the semantics of source and destination differ: for a Push RefSpec, the source denotes a Ref in the source Repository and the destination denotes a Ref in the target Repository.
+
Push Refspecs
+
A typical example for a Push RefSpec could be
+
HEAD:refs/heads/master
+
+
This means that the currently checked out branch (as signified by the HEAD Reference, see
+ Git References) will be pushed into the master branch of the remote repository.
+
+
Fetch Refspecs
+
A typical example for a Fetch RefSpec could be
+
refs/heads/*:refs/remotes/origin/*
+
+
This means that all branches from the remote repository will be fetched into the corresponding remote tracking branches of the local repository.
+
Remotes
+
Remotes are used to manage the repositories ("remotes") whose branches you track from your repository.
+
In EGit Remotes are defined when
+
+
+ Cloning a repository from another repository, by convention this repository the newly cloned one has been created from is named "origin". If you prefer a different name the clone wizard allows to specify that.
+
A Remote first of all defines a
+ name for the repository whose branches you track, this is important since you may want to track branches from different repositories so the name helps to understand what repository a certain operation is dealing with. In addition
+ Refspecs specified for a given Remote define a
+ mapping of branches and tags in your local repository to branches and tags in the remote repository. You may want to use different mappings for inbound or outbound transport operations hence there are
+ editors to define Fetch and Push Configurations available in EGit.
+
+
Git Ignore
+
.gitignore files located in the working tree specify files that intentionally should not be tracked by git. They only concern files that are not yet tracked by git. In order to ignore uncommitted changes in already tracked files refer to the
+ assume unchanged action.
+
+
Each line in .gitignore files defines a pattern. Git checks ignore patterns following the hierarchy of the working tree from highest to lowest. Patterns defined in higher level .gitignore files are overridden by those defined in lower levels.
+ Files which shall be ignored for all working on a given project are usually included in the project's repository to easily share them in the team.
the optional prefix
+ ! negates the pattern. Files excluded by a matching previous pattern become included again. Patterns ending with a slash only match directories but not files or symbolic links.
+
+
patterns not containing a slash are treated as shell glob patterns matched against the path relative to the location of the .gitignore file
+
git treats patterns as shell globs as defined in
+ fnmatch(3)
+
+
wildcards in patterns do not match
+ / in path names
+
+
a leading slash matches the beginning of a pathname
+
+
The EGit
+ Ignore
+ menu action adds the selected resource to the .gitignore file in the resource's parent directory. To enter other ignore patterns use a text editor.
+
+
Git Fetch Factory for PDE Build
+
As part of EGit's PDE Tools, there's a PDE Build fetch factory for Git included in the
+ org.eclipse.egit.fetchfactory plug-in.
+
+
The map file's file format:
+ type@id,[version]=GIT,args
+
+
Where
+ args is a comma-separated list of key-value pairs.
+
+
Accepted
+ args include:
+
+
+
+ tag* - mandatory Git tag
+
+
+ repo* - mandatory repo location
+
+
path - optional path relative to repo which points to the element (otherwise it's assumed that the element is at the repository root)
+
prebuilt - optional boolean value indicating that the path points to a pre-built bundle in the repository
+
+
Fetching is implemented as a three-step process:
+
+
The repository is cloned to local disc. If it already exists, it is assumed that it was previously cloned and just new commits will be fetched
+
The specified tag will be checked out in the local clone
+
The content of the path will be copied to the final build location
Considerations for Git Repositories to be used in Eclipse
+
The short story
+
When setting up Git Repositories with EGit, there are two recommendations for the creation of "productive" (as opposed to "playground") Repositories:
+
+
Don't create the Repository within the Eclipse workspace.
+
+
Be careful when cloning or creating a Repository.
+
Make sure to use the Git Sharing Wizard correctly.
+
+
+
Don't create a Repository with an Eclipse project as root.
+
+
Make sure to use the Git Sharing Wizard correctly.
+
+
+
+
The first mistake happens when you specify a workspace folder during cloning or creation of a Repository.
+
Both mistakes will happen when you use the Git Sharing Wizard from an Eclipse project that you have created manually in your workspace without taking precautions (the wizard has been fixed in the latest version).
+
Below you will find some motivation for these recommendations.
+
The longer story
+
Eclipse Workspace and Repository working directory
+
Git Repositories can be created in different ways, for example by cloning from an existing Repository, by creating one from scratch, or by using the EGit Sharing wizard.
+
In any case (unless you create a "bare" Repository, but that's not discussed here), the new Repository is essentially a folder on the local hard disk which contains the "working directory" and the metadata folder. The metadata folder is a dedicated child folder named ".git" and often referred to as ".git-folder". It contains the actual repository (i.e. the Commits, the References, the logs and such).
+
The metadata folder is totally transparent to the Git client, while the working directory is used to expose the currently checked out Repository content as files for tools and editors.
+
Typically, if these files are to be used in Eclipse, they must be imported into the Eclipse workspace in one way or another. In order to do so, the easiest way would be to check in .project files from which the "Import Existing Projects" wizard can create the projects easily. Thus in most cases, the structure of a Repository containing Eclipse projects would look similar to something like this:
+
+
+
+
Implications
+
The above has the following implications:
+
+
It is probably not a good idea to make a project the root folder of your Repository.
+
+
+
The reason is that you will never be able to add another project to this Repository, as the .project file will occupy the root folder; you could still add projects as sub-folders, but this kind of project nesting is known to cause lots of problems all over the place. In order to add another project, you would have to move the project to a sub-folder in the Repository and add the second project as another sub-folder before you could commit this change.
+
+
+
It is a good idea to keep your Repository outside of your Eclipse Workspace.
+
+
+
There are several reasons for this:
+
+
+
The new Repository will consider the complete folder structure of the Eclipse workspace as (potential) content. This can result in performance issues, for example when calculating the changes before committing (which will scan the complete .metadata folder, for example); more often than not, the workspace will contain dead folders (e.g. deleted projects) which semantically are not relevant for EGit but cannot be excluded easily.
+
+
+
The metadata (.git-) folder will be a child of the Eclipse Workspace. It is unclear whether this might cause unwanted folder traversals by Eclipse.
+
+
+
You can easily destroy your Repository by destroying your Eclipse Workspace.
+
+
Creating a new empty Git Repository
+
You can create a project first and share it afterwards. The Share Project Wizard supports creation of Git repositories (see
+ Adding a project to version control).
+
+
You can also create a new empty Git Repository from the Git Repositories View (see
+ Creating a Repository).
+
+
Creating a Git Repository for multiple Projects
+
You may create multiple projects under a common directory and then create a common repository for all projects in one go:
+
+
create the Eclipse projects (e.g. a, b, c) under a common directory (e.g. )
+
select all projects (a, b, c), and in the contextual menu click
+ Team > Share Project > Git
+
+
press
+ Next
+
+
select all projects (a, b, c)
+
the wizard automatically moves up the default repository location to the parent folder since multiple projects have been selected
+
click
+ Create Repository and
+ Finish
+
+
+
+
+
+
Starting from existing Git Repositories
+
In order to work with the content of a Git repository in the Eclipse workbench, the contained files and folders must be imported as projects. In principle, this import can be done using the generic "New Project" or "Import..." wizards, since the working directory of a Git Repository is just a normal directory in the local file system. However, the newly created projects would still have to be shared manually with Git. The "Import Projects from Git" wizard integrates project import and sharing and also offers some extra convenience.
+
Starting the import wizard
+
To start the wizard click
+ Import > Git > Projects from Git.
+
+
If you started in a clean workspace, the first page will display an empty list:
+
+
+
+
Before you can continue, you need to add one or several Git repositories to the list. If you already have repositories in the list, this step is optional.
+
Cloning or adding Repositories
+
There are two ways to add Git repositories to the list:
+
+
Clone a remote repository
+
Add an existing repository from your local file system
+
+
Cloning a Repository
+
The first option is used if you start with a remote repository. The clone operation will copy that repository to your local file system. To start the Clone Wizard click
+ Clone.... The Clone Wizard is described in more detail in
+ Cloning Remote Repositories. Upon successful completion of the clone operation, the newly cloned repository appears in the list automatically.
+
+
Adding a Repository
+
The second option is useful if you already have a repository in your local file system, for example because you have cloned it earlier, you created it from scratch or you copied it from somewhere else. Click
+ Add...; and select a directory in the local file system. Press
+ Search to trigger a scan for Git repositories contained in this directory. If Git repositories are found, they will be listed and you can select repositories to add:
+
+
+
+
+
After successful completion, the repository list should contain some repositories:
+
+
+
+
Selecting a Repository from the List
+
You can now select a repository and click
+ Next. On the following wizard page, you will decide how to import projects.
+
+
Importing projects
+
This page offers a group with radio buttons that allows you to select a wizard and a directory tree that optionally allows you to select a folder in the working directory.
+
+
+
+
Wizard for project import
+
Import Existing Projects
+
If this radio button is selected, the wizard will scan the local file system for .project files and display the projects found. This is the most comfortable solution and should be used if .project files are checked into the Repository.
+
Limiting the Scope for Project Import
+
In this case, the directory tree at the bottom is active. You can limit the search for .project files by selecting a folder in this tree, otherwise the complete working directory of the repository will be scanned. On the next page, a list of the found projects (if any) will be shown. This is very similar to the generic
+ Import Existing Projects wizard, but has some additional filtering capabilities:
+
+
+
+
+
Use the New Projects Wizard
+
When this option is chosen, the generic "New Project" wizard will open. After completion of the "New Project" wizard, the "Import Projects from Git" wizard will resume and assist with sharing the projects you just created.
+
In this case, the directory tree at the bottom is inactive, as the selection is not relevant for the "New Project" wizard.
+
Import as General Project
+
This option can be helpful when there are neither .project files available nor a suitable "New Project" wizard. If chosen, the wizard will generate a .project file and point the project to a folder of the Repository's working directory. The result is a "General Project".
+
By default, the newly generated project will point to the working directory of the Repository. By selecting some folder from the directory tree at the bottom, you can have the project generated for that folder.
+
Click
+ Next to open a simple dialog for entering a name and a directory for the new project:
+
+
+
+
+
By default the suggested project name matches the name of the directory.<br
+ />
+
Working with remote Repositories
+
Cloning Remote Repositories
+
Using the Git Clone Wizard you may clone remote repositories using different transport protocols.
+
The wizard can be started from the "Import Projects from Git" wizard using
+
+
+
+ File > Import... > Git > Projects from Git > Next > Clone URI > Next
+
+
or from the "Git Repositories View" (described in
+ Managing Repositories) using the
+ Clone a Git Repository toolbar button or view menu.
+
+
Repository Selection
+
On the first page of the wizard enter the location of the remote repository:
+
+
+
+
+
+ URI - The complete URI of the remote repository or the path on the file system. This field is automatically synchronized with the other fields.
+ Note that you can use the
+ Local file... button to browse for a local directory and that the URI field offers content assist by offering previously used values
+
+
+ Host - The name of the remote host or empty if cloning from the file system.
+
+
+ Repository Path - Path to the remote repository or on the file system.
+
+
+ Protocol - One of the protocols described below.
+
+
+ Port - Port number.
+
+
+ User - The user name used for authentication.
+
+
+ Password The password used for authentication.
+
+
+ Store in Secure Store Whether the password is saved in the Eclipse secure store.
+
+ git - The most efficient built-in git protocol (default port 9418). This protocol doesn't provide authentication. Typically used for anonymous read access to the repository.
+
+ ssh - Git over
+ secure shell (SSH) protocol. Typically used for authenticated write access to the repository.
+
+
+
+
+
+ Note: If you are behind a firewall you may need to configure your proxy settings (
+ Preferences > General > Network Connections). Many HTTP proxies are configured to block URLs containing a username (and/or password) like e.g.
+ http://fred:topsecret@egit.eclipse.org/egit.git hence it's recommended to use the
+ user,
+ password fields at the bottom of the wizard page, the credentials will be transmitted as HTTP headers.
+
+
Branch Selection
+
On the next page choose which branches shall be cloned from the remote repository:
+
+
+
+
If you are not sure which branches you need, simply hit "Select All".
+
You can filter the branches by their name by typing using the text control above the list. Note, however, that branches that have been checked will always be shown in the list, i.e. they will not be filtered.
+
Local Destination
+
On the next page define where you want to store the repository on the local file system and define some initial settings.
+
+
+
+
+
+ Directory - The directory which will contain the Git repository. It will be created by the wizard if it does not yet exist.
+
+
+ Initial branch - Choose here which local branch will be created and initially checked out.
+
+
+ Remote name - Define a name for the remote repository. The default is "origin".
+
+
+
The default root path for storing Git repositories can be configured in the Preference Menu
+
+ Window > Team > Git > Default Repository Folder
+
+
+
+
You can press
+ Finish on this page or press
+ Next if you are working with
+ Gerrit Code Review and you want to configure your repository accordingly.
+
+
Cloning from specific locations
+
The Clone wizard of EGit can be extended by other plugins in order to search for repositories on specific backends which host git repositories. Currently such an extension is available for Github and soon will be available for Gerrit. For both you need to install the respective Mylyn connectors. The Gerrit Mylyn connector extension then will also configure the remote repository for the work with Gerrit. This can also be done or changed later from the Git Repositories View, see
+ Gerrit Configuration.
+
+
When you have installed such an extension, the Clone wizard opens with a selection page where you can choose between different sources of the repository to clone:
+
+
+
+
Pushing to other Repositories
+
Pushing to upstream
+
If you are working with a local branch which has a so-called "
+ Upstream Configuration", the most convenient way for pushing relies on this upstream configuration.
+
+
Typically local branches are created based on a remote tracking branch. Since the remote tracking branch is associated with a remote and the remote contains the information required to access the corresponding remote repository, it is possible to automatically create this upstream configuration while creating the local branch (see
+ Branching for more information).
+
+
When pushing upstream from the local branch, push requires no further parameters and hence can be performed without showing another dialog based on the stored upstream configuration.
+
In order to push upstream, right-click on a project and select
+ Team > Push to upstream or right-click on a Repository in the Repositories View and click
+ Push to upstream. There is also an action available in the
+ Git Command Group.
+
+
+
Push will then be executed immediately after selecting the action. Once finished, a confirmation dialog will be shown displaying information about the pushed data and/or error messages:
+
+
+
+
Configuring upstream push
+
The upstream push can be configured using the "Configure..." button on the confirmation dialog (see above) or by right-clicking a project and selecting
+ Team > Remote > Configure push to upstream....
+
+
A configuration dialog will be shown for configuration of push URIs and corresponding branch mappings (RefSpecs):
+
+
+
+
The dialog is divided into three main sections. In the upper part, information about the currently checked out branch and the remote it's following is shown. Usually local branches are created based on a remote tracking branch which auto-configures that the local branch tracks this remote tracking branch.
+
In this specific example, there is a warning message that there are several branches that use the remote named "origin". This means that changes in the push configuration will affect all these branches, not just the branch shown in the Branch field. Move your mouse over the warning to display these branches in a tooltip.
+
The URI Group contains two controls, a URI field and a Push URIs list. If the list is empty, the URI in the URI field will be used for Push, if at least one entry is in the Push URIs list, the URIs in the list will be used instead. It should be noted that if the Push URIs list is empty and the URI is changed in this dialog, the new URI will also be used for Pull, so care should be taken when doing so.
+
The RefMapping Group allows specification of one or several RefSpecs (see
+ Refspecs) for Push.
+
+
"Add" will open a small wizard that helps in the creation of the RefSpecs. You can also paste a RefSpec from the clipboard into the list.
+
Clicking on the "Advanced" control will show/hide an "Edit (Advanced...)" button that allows for more complex RefSpec editing similar to the
+ Push Wizard below.
+
+
The buttons in the lower button bar allow you to save your changes and do the push immediately, save the changes without fetching, dry-run (push without saving the configuration), revert your changes, and Cancel.
+
Direct Push
+
Alternatively, you can use
+ Direct Push Support on a Push Specification of a Remote.
+
+
Push Wizard
+
The most powerful (but also most complex) way is using the Push Wizard
+
+ Team > Remote > Push...
+
+
Push URI
+
+
If you already configured a Push Specification in the Repositories View you may also select it here using the drop-down list under
+ Configured remote repositories. The
+ Finish button will be enabled if the Push Specification for this remote is configured properly (i.e. has at least one URI and a ref spec.
+
+
Otherwise click
+ Custom URI and enter the URI of the upstream repository you want to push to.
+
Click
+ Next
+ If this is the first time you connect to this repository via ssh you will have to accept the host key of the remote repository
+
+
+
+
+
If your ssh key is protected by a passphrase (which is recommended) you have to enter it here
+
+
+
+
Click
+ Add all branches spec
+
+
+
+
+
This is a convenient way to declare that you want to map your local branch names to the same branch names on the upstream repository you want to push changes to.
+
Click
+ Add all tags spec to map local tags 1:1 to tags in the repository you want to push to.
+
+
If you want to map local branches to those in the upstream repository in a different way you may define more detailed mapping specifications in the following way
+
+
enter source and destination ref or select already existing branches from the drop-down lists
+
click
+ Add Spec
+
+
+
This will transfer the newly defined mapping to the list
+ Specifications for push
+
+
+ Other common push specs:
+
+
+
You may e.g. map refs/heads/* to refs/heads/joe/* if you want to name the branches you push to according to your nickname
+ joe. This is useful if multiple users want to publish their local branches on personal branches in a jointly used public repository.
+
+
Another usual mapping is to map the source ref HEAD to the destination refs/heads/master. This means you want to map your current HEAD (which might currently point e.g. to any local topic branch) to the upstream master branch.
+
+
Delete Ref Specifications
+
To delete a ref in the destination repository select the ref to be deleted from the drop-down list
+ Remote ref to delete and click
+ Add Spec. This will create a corresponding entry in the
+ Specifications for push list. Alternatively you may type in the specification for the refs to be deleted, this may also use wildcards. Pushing Delete Ref Specifications will delete the matching Refs in the destination repository.
+
+
+
+
+
Conflicting Push Ref Specifications
+
If you add multiple conflicting Push Ref Specifications they will be marked in red, solve this by removing or editing the conflicting specs. It is also possible to edit the specs in-place in the list
+ Specifications for push
+
+
+
+
+
Push Confirmation
+
Click
+ Next
+
+
This will open the Push Confirmation dialog showing a preview which changes will be pushed to the destination repository. If this does not match your expectation click
+ Back and correct your push specs accordingly.
+
+
+
For ref updates the range of commits to be pushed will be shown in the format
+ <SHA1-from>..<SHA1-to> e.g.
+ d97f5a2e..adfdbfd2 means all commits between
+ d97f5a2e and
+ adfdbfd2 will be pushed.
+
+
For refs which do not yet exist in the destination repository
+ [new branch] or
+ [new tag] is displayed.
+
+
For refs which will be delete
+ [deleted] is shown.
+
+
+
+
+
+
+
Select the
+ Push only if remote refs don't change in the mean time check box if you want to be sure that what you see in this preview is also what you get when pushing these changes out.
+
+
Select the
+ Show final report dialog only when it differs from this confirmation report check box if you only want to get a report after executing the push if the result differs from this preview.
+
+
+
Push Result Report
+
Click
+ Finish
+
+
Depending on the options you have chosen a push result report dialog is shown. It displays the list of commits which are pushed to the remote.
+
+
+
+
In the box at the bottom the push confirmation message from the remote server is displayed. In case of any errors you will find the error message from the remote server here. To see the message for a given list entry simply select it in the list.
+
Click
+ Ok to close the dialog.
+
+
+
+
Fetching from other Repositories
+
Fetching from upstream
+
If you are working with a local branch which has a so-called "
+ Upstream Configuration", the most convenient way for fetching relies on this upstream configuration.
+
+
A local branch is typically created based on a remote tracking branch. Since the remote tracking branch is associated with a remote and this remote contains the information required to access the remote repository, it is possible to automatically create this upstream configuration while creating the local branch (see
+ Branching for more information).
+
+
When fetching from upstream, this persisted configuration can be used to fetch automatically without the need to provide further parameters in a dialog.
+
In order to fetch from upstream, click
+ Team > Fetch from upstream on a project or click
+ Fetch from upstream on a Repository in the Repositories View. There is also an action available in the
+ Git Command Group.
+
+
Fetch will be executed immediately after selecting the action. Once finished, a confirmation dialog will be shown displaying information about the fetched data and/or error messages:
+
+
+
+
Configuring fetch from upstream
+
The upstream fetch can be configured using the "Configure..." button on the confirmation dialog (see above) or by clicking
+ Team > Remote > Configure fetch from upstream... on a project.
+
+
A configuration dialog will be shown for configuring the fetch URI and branch mappings (RefSpecs):
+
+
+
+
The dialog is divided into three main sections. In the upper part, information about the currently checked out branch and the remote it's following is shown.
+
The URI field can be used to add/change the fetch URI.
+
The RefMapping Group allows specification of one or several RefSpecs (see
+ Refspecs) for Fetch.
+
+
The "Add" button will open a small wizard that helps in the creation of the RefSpecs. You can also paste a RefSpec from the clipboard into the list.
+
Clicking on the "Advanced" control will show/hide an "Edit (Advanced...)" button that allows for more complex RefSpec editing similar to the
+ Fetch Wizard.
+
+
The buttons in the lower button bar allow you to save your changes and do the fetch immediately, save the changes without fetching, dry-run (fetch without saving the configuration), revert your changes, and Cancel.
+
Direct Fetch
+
Another way for fetching is to use
+ Direct Fetch Support on a Fetch Specification of a Remote.
+
+
Fetch Wizard
+
The most powerful (but also most complex) way is using the Fetch Wizard
+
+
+
+ Team > Fetch...
+
+
+
If you already configured a Fetch Specification in the Repositories View you may also select it here using the drop-down list under
+ Configured remote repositories. The
+ Finish button will be enabled if the Fetch Specification for this remote is configured properly (i.e. has at least one URI and a ref spec.
+
+
+
+
+
+
+
Otherwise click
+ Custom URI and enter the URI of the upstream repository you want to fetch changes from.
+
This is a convenient way to declare that you want to map the branch names in the upstream repository you want to fetch changes from 1:1 to the same local branch names.
+
+
Click in the edit field
+ Destination Ref and replace the path segment
+ choose_remote_name with a symbolic name for the upstream repository you are going to fetch from.
+
+
The default remote name for the repository your repository has been cloned from is
+ origin. The master of this remote maps by default from
+ refs/heads/master to
+ refs/remotes/origin/master.
+
+
If you e.g. want to additionally track branches from Joe's repository in your local repository you would map the branch in his repository
+ refs/heads/* to the following tracking branches
+ refs/remotes/joe/*.
+
+
Deselect
+ Force Update if you want to allow fast-forward updates only, select this option if you also want to allow non-fast-forward changes.
+
+
Click
+ Force Update all Refs to set the force update option on all specs
+
+
Click
+ Remove all specs to remove all specs from the list
+ Specifications for fetch
+
+
+
+
Click
+ Add all tags spec to map tags tags in the repository you want to fetch from 1:1 to local tags.
+
+
+
If you want to map branches or tags in the upstream repository to local branches in a different way you may define more detailed mapping specifications in the following way
+
+
enter source (ref in source repository) and destination ref (tracking branch or tag in local repository) or select already existing branches from the drop-down lists
+
click
+ Add Spec
+
+
+
This will transfer the newly defined mapping to the list
+ Specifications for fetch
+
+
Fetch Result Report
+
Click
+ Finish
+
+
+
+
+
A fetch result dialog is shown.
+
+
For ref updates the list commits which have been fetched will be shown.
+
For refs which didn't exist before in the local repository
+ [new branch] or
+ [new tag] is displayed.
+
+
For refs which have been deleted
+ [deleted] is shown.
+
+
+
+
+
+
Pulling New Changes from Upstream Branch
+
+
Right-click on a project in the Package Explorer and select
+ Team > Pull or right-click on a repository in the Git Repositories view and select
+ Pull to pull new changes from the upstream branch your local branch is tracking. This also works if resources are selected from more than one repository.
+
+
Whenever you create a local branch based on a remote tracking branch EGit can configure a tracking relationship so that subsequent pulls will fetch and then merge or rebase (depending on the configuration of this tracking relationship) the changes from the tracked upstream branch; see
+ Branching for details.
+
+
+
Ad-hoc selection of the upstream branch to pull from is not yet supported by EGit.
if you did no local change or want to discard your local changes, use
+ Team > Reset...
+
+
+
+
+
+
+
Working with Gerrit
+
If you are working with
+ Gerrit Code Review, EGit allows you to conveniently push and fetch changes to and from the Gerrit servers.
+
+
Enabling Gerrit for a repository
+
When a repository is cloned in EGit from a Gerrit server using a http, https, or ssh URI, EGit will automatically set up the clone for use with Gerrit. The repository clone is configured such that
+
+
fetching also fetches the review notes from Gerrit,
+
pushing by default pushes the commits for review, and
+
commit messages automatically get a Gerrit Change-Id unless they already have one.
+
+
If a repository cloned from a Gerrit server outside of EGit is used in EGit, the clone may not be set up such that EGit recognizes it as a Gerrit repository. Gerrit operations in EGit will not appear in any menus unless you configure your repository first. To do that, open the Git Repositories view and browse down to the
+ Remote that represents the Git repository server you want to use and select
+ Gerrit Configuration....
+
+
Pushing a change to a Gerrit Code Review Server
+
Right-click on a project and select
+ Team > Remote > Push to Gerrit... or right-click on a Repository node in the Repositories View and select
+ Push to Gerrit...
+
+
A dialog will appear that lets you select or enter a URI and branch name:
+
+
+
+
+
In the URI combo, select or enter the URI that points to your Gerrit instance; the combo will be pre-filled with all URIs defined in any remote of your current Repository; in addition you can type any URI into this field
+
In the Gerrit Branch field, enter the name of the branch to select the review queue your changes will be be pushed to
+
Optionally, enable the topic and enter a topic identifier. EGit proposes the last used topic for the local branch being pushed, or the local branch name.
+
+
The dialog also offers a content assist for the Gerrit branch. Simply press "Ctrl+Space" to activate this (consult the tooltip that appears when hovering over the little bulb decorator near the Gerrit Branch field). The remote tracking branches for the current repository will be shown. Note that this content assist is filtered, so in order to see all proposals, you need to make sure to have the Gerrit Branch field empty before requesting the content assist.
+
Upon clicking
+ Finish, the currently checked out commit will be pushed to the Gerrit branch specified. Also, the URI and Gerrit Branch values will be remembered and suggested again when the dialog is opened again later.
+
+
This allows for more flexibility when working with different Gerrit branches in parallel (e.g. frequently switching between development and hotfixing).
+
Pushing as Draft
+
The "refs/for" in the "Push to Gerrit" wizard is a combo drop-down box; click it and select "refs/drafts" instead of "refs/for" to
+ push a draft change to Gerrit.
+
+
Editing a change
+
When a change has been pushed to Gerrit and the reviewers suggest to make some improvements, a new patch set for the change has to be uploaded. First, edit the commit(s):
+
+
In case you have one commit corresponding to one change, you can amend the commit (see
+ Amending Commits).
+
+
In case you have multiple dependent commits and need to edit a commit other than the last one, you can do an interactive rebase (see
+ Interactive Rebase). Alternatively, check out the commit you want to edit, amend it and then cherry-pick the later commits on top (this is what interactive rebase does for you).
+
+
+
Then push again to the same branch. Gerrit will detect that you are updating existing changes and will add new patch sets.
+
Fetching a change from a Gerrit Code Review Server
+
Right-click on a project and select
+ Team > Remote > Fetch from Gerrit... or right-click on a Repository node in the Repositories View and select
+ Fetch from Gerrit...
+
+
A dialog will appear that lets you select or enter a URI and a change as well as some additional options:
+
+
+
+
+
In the URI combo, select or enter the URI that points to your Gerrit instance; the combo will be pre-filled with all URIs defined in any remote of your current Repository; in addition you can type any URI into this field
+
In the Change field, you must enter the full name of a change; you can either take this value from the Gerrit Web UI, use the content assist described below, or build the name using the following pattern:
+ "refs/changes/" + (last two digits from change number) + / + (change number) + / + (revision number)
+
+
In the "Actions to perform after fetch" you can decide what to do after the change has been fetched; you can either create and checkout a branch pointing to the change, create and checkout a tag pointing to the change, or simply checkout the change (thus making HEAD detached); the last option does nothing after fetch, but you will be able to find the commit pertaining to the change at FETCH_HEAD (go to the Repositories View and find FETCH_HEAD under the References node of your Repository, see
+ Inspecting References ).
+ The name for the branch or tag is suggested by the dialog but can be overwritten as needed.
+ Since deletion of tags is currently not supported in EGit, we suggest to use local branches rather than tags for the time being. Since the Repositories view allows to group branches hierarchically using "/" as hierarchy separator, the suggested names can come in very handy when dealing with large numbers of changes.
+
+
+
Instead of the tedious copy-paste or manual entering of the change ID, the dialog also offers a content assist for the change. Simply press "Ctrl+Space" to activate this (consult the tooltip that appears when hovering over the little bulb decorator near the Change field). The Gerrit Server will be contacted and all available changes will be fetched and shown in a content assist dialog:
+
+
+
+
The list will be filtered with your input in the change field. After selecting the change in the content assist, the Change field will be filled with the correct information.
+
You can also copy the download command from the Gerrit WebUI to the clipboard before opening the
+ Fetch from Gerrit... wizard. This will automatically populate the dialog with the values needed to fetch this change.
+
+
+
+
+
The Change field is also automatically filled in (and content assist is triggered) if the clipboard contains a web URL pointing to a Gerrit change, or the change number part of such a URL (numbers separated by "/"), or a plain change number.
+
Working with Gitflow
+
If you are using Gitflow (
+ http://nvie.com/posts/a-successful-git-branching-model/), EGit allows you to work with Gitflow operations, managing feature, release and hotfix branches. Install the feature "Git integration for Eclipse - Gitflow support" in order to install EGit's Gitflow integration.
+
+
Enabling Gitflow for a repository
+
Gitflow operations will not appear unless the selected repository is configured for Gitflow. To do that, open the context menu on a repository in the Git Repositories view and select
+ Init Git Flow.
+
+
+
+
You can skip this step if your repository was already configured for Gitflow by another client.
+
Starting a feature/release/hotfix
+
Right-click on a repository, select
+ Git Flow, and select the appropriate start command.
+
+
+
+
+
+
+
A dialog will appear that lets you enter a name for the Gitflow branch, adding the correct prefix automatically.
+
Starting release from a commit other than HEAD
+
Go to the EGit History view, and right-click the commit you want to start the release from.
+ In the context menu, go to
+ Git Flow, and select
+ Start release from commit <sha1>.
+
+
+
+
Inspecting the state of the Repository
+
Label Decorations
+
Label decorations show Git-specific information about resources under Git version control. They appear in all views showing model objects, like Package Explorer, Project Explorer, Navigator, and Hierarchy View.
+
The Git label decorations can be switched on globally in the Preference Menu (
+ Window > Preferences) under
+ General > Appearance > Label Decorations, and more detailed settings can be modified in Preferences under
+ Window > Preferences > Team > Git > Label Decorations.
+
+
There are two different types of label decorations: text decorations and icon decorations.
+
Text Decorations
+
Text decorations appear on the left or right side of the text label. They can be configured on the Preferences dialog under
+ Team > Git > Label Decorations on the
+ Text Decorations tab. For example, the default for a dirty resource is a
+ > on the left side of its name.
+
+
These are the default settings:
+
+
+
+
For files and folders there are the variables "name", "dirty" and "staged". "Dirty" and "staged" are flags; if they are true, the text after the colon is displayed.
+
For projects there are the additional variables "repository", "branch" and "branch_status". The "repository" variable displays the name of the repository.
+
The "branch" variable displays the name of the currently checked out branch. If no branch is checked out, the decoration shows the shortened name of the commit (first seven characters followed by ellipsis). If tags and/or remote branches are pointing to this commit, a "best guess" heuristic is applied to also show this information: tags take precedence over remote branches, and if several tags apply, the newest one is displayed. If there are several remote branches or tags that have no modification date, then alphabetic sorting is applied and the last one is shown. Example: the checked out commit
+ e49f576... refers to tag
+ v.0.7.1 of repository
+ egit:
+
+
+
+
+
+
The "branch_status" variable shows the status of the local branch compared to the remote-tracking branch that is set as upstream:
+
+
↑N – The local branch has
+ N commits that are not yet on the remote-tracking branch. This can be read as "N commits to push".
+
+
↓M – The remote-tracking branch has
+ M commits that are not on the local branch. This can be read as "M commits to merge/rebase".
+
+
↑N↓M – The local branch and the remote-tracking branch have diverged (the two above apply both).
+
– Empty if the local branch and the remote-tracking branch have the same state.
+
+
The status variable can be used with a leading space like this: { branch_status}. This results in the space being added only when the status is not empty.
+
Icon Decorations
+
Icon decorations appear on the lower right corner of the icon displayed in front of the label. They can be configured on the Preferences dialog under
+ Team > Git > Label Decorations on the tab
+ Icon Decorations.
+
+
These are the default decorations:
+
+
+
+
+
+ dirty (folder) - At least one file below the folder is dirty; that means that it has changes in the working tree that are neither in the index nor in the repository.
+
+
+ tracked - The resource is known to the Git repository and hence under version control.
+
+
+ untracked - The resource is not known to the Git repository and will not be version controlled until it is explicitly added.
+
+
+ ignored - The resource is ignored by the Git team provider. The preference settings under
+ Team > Ignored Resources, "derived" flag and settings from .gitignore files are taken into account.
+
+
+ dirty - The resource has changes in the working tree that are neither in the index nor in the repository.
+
+
+ staged - The resource has changes which have been added to the index. Note that adding changes to the index is currently possible only in the commit dialog via the context menu of a resource.
+
+
+ partially-staged - The resource has changes which are added to the index and additional changes in the working tree that neither reached the index nor have been committed to the repository. See
+ partial staging from the Git Staging view for how to do that.
+
+
+ added - The resource has not yet reached any commit in the repository but has been freshly added to the Git repository in order to be tracked in future.
+
+
+ removed - The resource is staged for removal from the Git repository.
+
+
+ conflict - A merge conflict exists for the file.
+
+
+ assume-valid - The resource has the "assume unchanged" flag. This means that Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to tell Git when you change the working tree file. Also see
+ Assume unchanged action.
+
+
+
Commit Dialog
+
A summary of the status of all modified tracked files is displayed on the commit dialog. By double clicking a file the changes to be committed will be displayed in a compare dialog. As EGit currently always commits the content of the working tree (corresponding to git commit -a on the command line) the compare dialog will compare the working tree with the last commit.
+
+
+
+
+
Comparing Content
+
In daily work you will often want to see the changes between your last commit, the index, and the current working tree. In order to do so, select a Resource (project, folder, or file) in the project explorer or navigator and right-click an action under
+ Compare With.
+
+
To analyze the contents of a specific commit you should use the
+ History View which supports this task much better, see task
+ Inspecting Commits.
+
+
Compare editor and Synchronize View
+
If you use any of the submenu actions of
+ Compare With on a single file, a compare editor will be shown, otherwise (since EGit 3.1) the
+ Synchronize View will be opened that lets you browse the changes; by double-clicking on a changed file in this view, a compare editor will be opened for this file. In the toolbar of the Synchronize View you can select the Sychronize Model you want to use for presenting the changes you are inspecting.
+
+
+
+
+
Compare working tree with last commit
+
The difference between a resource in the current working directory and in the last commit in the current branch can be viewed from the context menu
+ Compare With > HEAD revision. This feature is also available in the Commit dialog. Double clicking on an entry in the Commit dialog opens a compare dialog.
+
+
Comparing Working Tree with Index
+
The differences between the current working tree and the index (based on the currently selected resource) can be viewed from the context menu
+ Compare With > Git Index.
+
+
Comparing Working Tree with a branch, a tag or a reference
+
+
Select a resource
+
right-click
+ Compare With > Branch, Tag, or Reference...
+
+
select a branch, tag or reference
+
+
Comparing Working Tree with Any Commit
+
From the project explorer:
+
+
Select a resource
+
right-click
+ Compare With > Commit...
+
+
select a commit from the commit graph
+
+
From the history view (files only):
+
+
Select a file in the package explorer
+
right-click
+ Team > Show in History or
+ Compare With > History...
+
+
in the commit graph select a commit
+
from the context menu select
+ Compare with working tree
+
+
this will open a compare dialog showing the changes between the selected commit and the current working tree
+
+
Comparing Two Commits
+
+
Select a resource in the Package Explorer
+
click
+ Team > Show in History or
+ Compare With > History... (the latter for files only)
+
+
in the commit graph select two commits
+
right-click
+ Compare with each other
+
+
this will open a compare dialog showing the changes between the two selected commits
+
you can also open a Git Tree Compare view by right-clicking
+ Compare with each other in Tree
+
+
+
Comparing Index with HEAD or Any Other Commit
+
You can compare Index with HEAD using the Staging View. Double click a file displayed in the "Staged Changes" pane to compare its Index version against the HEAD version.
+ Comparison between Index and another commit isn't implemented yet.
+
+
+
+
Comparing with Branches (Synchronize)
+
The difference between the working tree (including not committed changes) and a branch or tag can be viewed (since EGit 3.1) by selecting the project(s) you want to compare and clicking
+ Compare With > Branch, Tag or Reference. The result is filtered for the resources you selected before starting the comparison.
+
+
You can also compare with a branch by clicking the dynamic menu
+ Team > Synchronize on a project and selecting the
+ Ref you want to synchronize your working tree against. If the Git repository contains multiple Eclipse projects it is sufficient to select one project, the
+ Synchronization View will also include all other projects.
+
+
+
+
+
If you want to synchronize with a Ref not listed in the dynamic menu click
+ Team > Synchronize > Other.... Then in the Synchronize Wizard click into the destination column of the repository you want to synchronize and select the Ref you want to compare against.
+
+
+
+
+
When clicking "Include local uncommitted changes in comparison" also local, not yet staged changes and the already staged changes will be shown in comparison.
+
It is also possible to compare multiple repositories at once. In this case in the Synchronize Wizard select for each repository the Ref you want to compare against.
+
Quickdiff
+
Instead of using a compare editor you can enable quick diff support and see the changes within the text editor.
+
+ This feature can be enabled via the
+ General > Editors > Text Editors > Quick Diff preference page:
+
+
+
+
+
The difference annotation will then be displayed on the left hand side of the editor:
+
+
+
+
If you move your mouse over the annotation you see the content of the version you are comparing to:
+
+
+
+
Per default, the comparison is against the HEAD. You can determine the version you are comparing to, the so-called quickdiff baseline, from the context menu of a commit in the history view (
+ Show in > History). There are three menu entries:
+
+
+
+ Quick Diff -> Reset baseline to first parent of HEAD - Compare against the first commit before HEAD.
+
+
+ Quick Diff -> Reset baseline to HEAD - Compare against HEAD.
+
+
+ Quick Diff -> Set as baseline - Compare against the selected commit
+
+
+
+
+
+
Inspecting Commits
+
To inspect a given commit
+
+
from the context menu in package explorer select
+ Team > Show in History
+
+
select the commit you want to inspect
+
+
+
+
+
View Diff for a Commit
+
The history view displays the diff in the lower left pane. Selecting a file in the lower right pane shows the diff for this file.
+
Showing the contents of a Commit
+
The behavior of a double click on a file in the lower right pane depends on the state of the compare mode toggle button. If it's on, a compare editor will be opened which compares the file content in the current commit with the content in the ancestor commit; if it's off, an editor will be opened showing the file content in the current commit.
+
Committing Changes
+
Modifications to a project under git version control are persisted in the git history through commits. Starting from the state checked out from the git repository modify your project until you have reached a state you are satisfied with and then commit all these changes into the repository as one single commit. Each commit represents a well defined snapshot of all the files stored in the repository.
+
Modifying the content
+
To modify a project which is already shared with Git modify or delete files either within Eclipse or directly in the file system. There is no need to tell Git in advance about these operations. New files which should be version-controlled have to be explicitly put under Git version control :
+
+
click
+ Team > Add in the file's context menu
+
+
+
Alternatively you may display untracked files in the Commit dialog and check the
+ Show untracked Files checkbox to select them for inclusion into the commit.
+
+
Label decorators, e.g. in the Package Explorer View, show :
+
+
untracked files which are not yet under git version control (marked with "?")
+
files which have been added (marked with "+")
+
modified files (marked with ">" in front of the filename)
a file modified in the working tree but not yet staged for the next commit
+
a modified file which modifications have been staged for the next commit
+
a file which has been newly staged for first-time inclusion with the next commit
+
a file which is not under git version control
+
+
+
+
+
Committing
+
There are two ways to commit changes with EGit:
+
+
using the
+ Staging View, or
+
+
using the
+ Commit Dialog.
+
+
+
The Commit Dialog is considered deprecated and may be removed in future versions. Since EGit 4.4, the
+ Team > Commit... context menu action by default opens the staging view instead of the commit dialog.
+
+
This behavior is, for the time being, configurable in the global
+ Preferences > Team > Git > Committing preferences.
+
+
+
+
+
If "Use Staging View to commit instead of Commit Dialog" is checked (the default setting), the
+ Team > Commit... action will open the staging view. If it's unchecked, the commit dialog will be opened.
+
+
If the staging view is used an additional option "Automatically stage selected resources on commit" available since EGit 4.5 determines whether selected files should be automatically staged when
+ Team > Commit... is invoked. This will stage all changes contained in the selected resources. It makes the behavior a bit more consistent with the way the commit dialog works: in the commit dialog, individual files can be checked or unchecked for inclusion in the commit, and selected files are checked by default. In the staging view, you compose your commit by staging changes, and only staged changes will be committed. Auto-staging thus includes the selected files automatically in the commit when the staging view is used.
+
+
The "Include selected untracked files" option determines whether selected files that are not yet in the git repository at all are included in the commit (checked in the commit dialog, or auto-staged in the staging view if auto-staging is on).
+
Committing with the Staging View
+
The preferred way to create commits with EGit is the
+ Staging View since it always shows the current git status for the selected repository and allows to stage (add to git index) and unstage (remove from git index) modified files. Double click a file in the
+ Unstaged Changes pane to compare it against the git index, double click a file in the
+ Staged Changes pane to compare it's index version against HEAD. In the Staging View you can edit the commit message incrementally since it's a view and not a modal editor.
+
+
+
+
+
Committing using Commit Dialog
+
To commit a change click
+ Team > Commit... in the context menu of a resource in the project.
+
+
Git tracks all changes made to the entire repository capturing the modifications of all version-controlled files in that repository not regarding if these files reside in the same Eclipse project or not.
+
Once you have triggered the commit the
+ Commit Dialog will pop-up
+
+
+
+
+
Select the changes you want to commit, enter the commit message and to create the commit, press
+ Ctrl+Enter (
+ Command+Enter on Mac OS X) in the commit message text field, or click
+ Commit.
+
+
Commit Message
+
In the Staging View or Commit Dialog you specify the commit message describing the change.
+
It is good practice to start the message with a short first line summarizing the change followed by a blank line and then the message body. In order to ensure that also git command line tools can format these messages nicely the lines shouldn't be formatted too wide (this is indicated by a grey vertical line).
+
+
+
+
The commit message text is checked for errors by the Eclipse spell checker. The spell checker can be configured via the Eclipse
+ Preferences > General > Editors > Text Editors > Spelling. Press
+ Ctrl+1 to open quick fixes which may help to fix the spelling errors.
+
+
+
+
+
The commit message editor supports content assist for file names shown in Files section of the commit dialog, which can be activated pressing Ctrl+Space.
+
+
+ Footer Tags
+
+
+ In the last paragraph of the commit message (i.e. after the last blank line), optional footer tags may follow:
+
+
+Bug: 3176
+Change-Id: I267b97ecccb5251cec54cec90207e075ab50503e
+Reported-by: Joe Developer <joe@dev.org>
+Signed-off-by: William Shakespeare <will.from@the.past>
+
+
The semantics of these tags are project or tool specific
+
+
If there is an entry in a bug tracking system for the change to be committed it is a good idea to add it here as a bug tag
+
+ Gerrit Code Review uses the
+ Change-Id: footer to correlate different patchsets of a change evolving during the review process towards the finally accepted patch. To generate a Gerrit Change-Id click
+ Compute Change-Id for Gerrit Code Review; the ID will be generated on commit, until then a null Change-Id is shown as a placeholder. With the EGit configuration parameter
+ gerrit.createchangeid set to true the corresponding checkbox in the Commit Dialog is always preselected. This parameter can be set on repository level, on system level or on user level. See
+ Repository Configuration for more information.
+
+
The
+ Signed-off-by: footer is used by many projects to create a formal track record of declarations that the signing author contributed the changes under the project's license and IP rules. This way the IP provenance of a project's evolving code base can be captured on a technical level. See e.g. the
+ Developer Certificate Of Origin used by the Linux kernel project. If the EGit preference
+ Insert Signed-off-by in
+ Team > Git > Commit Dialog is set the corresponding checkbox in the Commit Dialog is always preselected.
+
+
+
+ Selecting changes to commit
+
+
+
When you click
+ Commit in the
+ Staging View only staged changes will be committed. The native git command line works in the same way. All unstaged changes will stay untouched and remain in your working directory. This feature is often used to separate modifications done to a set of files into different commits.
+
+
When you click
+ Commit in the
+ Commit Dialog you can use the checkbox in front of each file to decide if you want to include its changes into the new commit. If you clear the checkbox in front of a file, the changes to this file will not be included in the commit. The local file in your eclipse workspace will still contain the modifications giving you the chance to commit these changes with a subsequent commit.
+
+
+
+ One example: Imagine since the last commit you have fixed a bug in A.java and you have added a new method to B.java. These two modifications are logically independent from each other hence you may want to commit them in two independent commits. In this case you initate the commit, deselect B.java from the set of committed files and specify a commit message describing only the bugfix in A.java. After a successful first commit you just call commit again and the upcoming dialog will present you the remaining changes in B.java. Now you specify a commit message describing the addition of the method and finish the second commit.
+
+
In the Commit Dialog new files you added to the project which have not been explicitly added to version control (see "Modifying the content") will be listed in the commit dialog if you select the checkbox "Show untracked Files". If you select the checkbox in front of these files in the list they will be added to the repository and committed once you press the commit button. Files which are excluded by a .gitignore file will not be shown here. If you have no other changes in your repository than such untracked files the checkbox
+ Show untracked Files is selected by default.
+
+
Amending Commits
+
If you recognize that you missed something when committing a change you may fix this: open the staging view or commit dialog again and specify that the current commit shall "amend" the previous commit in the current branch. The new commit will then replace the previous one. This feature is often used to correct incorrect commits before they are published to other repositories.
+
+ Note: do not amend commits if they have already been published to a shared repository since this may disturb others if they already based their changes on the published change.
+
+
+ Amend example:
+
+ Imagine you have committed a change to a file containing a typo
+
+
+
+
+
After committing the change you detect a typo. In order to correct this typo and the corresponding commit you just fix the typo in the source file
+
+
+
+
Then open the Staging View or Commit Dialog again and select the
+ Amend Previous Commit icon in the toolbar.
+
+
+
+
+
The commit message of your previous commit (the one you want to replace) is then filled into the "Commit Message" field. This gives you the chance not only to correct errors in the content of the version-controlled files but to also correct errors (e.g. typos) in the commit message describing your change.
+
As an alternative to amending you could just commit the corrected version as a subsequent commit. But the first commit containing the typo is of no use to anybody and in order not to clutter the history of your project with unneeded commits you should amend the commit.
+
Be aware that amending commits which are already published to other repositories may cause trouble. Once you have pushed a commit to a remote repository or your local repository was cloned by somebody else, you should be very careful with amending commits. In this case publishing a second commit which corrects the first one is probably a better solution. Otherwise inform all others that you amended a published commit so that they can react accordingly.
+
Reverting Changes
+
Reverting changes in the working tree
+
Replace with File in Git Index
+
Changes which are not yet committed and not yet staged can be reverted for a set of selected files.
+ Select the file(s) in the Package Explorer or an analogous view and click
+ Replace With > File in Git Index.
+
+
Replace with HEAD
+
Click
+ Replace With > HEAD to replace the selected files with their HEAD version. You can also use
+ Reset to with option
+ hard to forcefully reset the entire working tree of your repository back to the state of the HEAD commit (See "Resetting your current HEAD" below). This operation will revert all changes in the working tree and the index.
+
+
Replace with Branch, Tag or Reference
+
Click
+ Replace With > Branch, Tag or Reference to replace the selected files with their version corresponding to a branch, tag or reference.
+
+
Replace with Commit
+
Click
+ Replace With > Commit to replace the selected files with their version corresponding to a selected commit.
+
+
Replace with Previous Revision
+
Changes that are already staged or even committed can be "reverted" by replacing them with a version from the previous commit. Select a single resource in the Package Explorer or an analogous view and click
+ Replace With > Previous Revision. The repository will determine the last commit that modified the selected resource and offer to replace the workspace resource with the contents of this commit.
+
+
This is mainly intended for "removing" single files from a commit (when committing the reverted workspace resources, they are effectively removed from the current commit). Even though this also works on folders and projects, the results of replacing a folder or project with a "previous revision" may be unexpected.
+
Revert using quickdiff
+
The quickdiff feature can be used to revert individual changes to a file. You can revert by line, block (se range of changes lines) or selection. Select all text and then
+ Revert selection to revert a whole file.
+
+
Reverting changes introduced by a specific commit
+
Changes which are introduced by a given commit can be reverted by an automatically created new commit on top of the currently checked out commit. The commit which is to be reverted does not have to be checked out for that.
+
Select the commit in the History View, open the context menu and select
+ Revert Commit. This reverts the changes that the selected commit introduces by creating a new commit on top of the currently checked out commit.
+
+
Resetting your current HEAD
+
Git offers the possibility to reset the HEAD of the current branch to any other commit. It optionally resets the index and the working tree to match that commit. Note that this action affects all files and folders in the entire repository.
+
You have the option to do a hard reset, a mixed reset and a soft reset.
+
+
+ soft - the HEAD points now to the new commit, the index and the working tree are unchanged
+
+
+ mixed - the HEAD points now to the new commit, the index is updated, the working tree is unchanged
+
+
+ hard - the HEAD points now to the new commit, the index and the working tree are updated
+
+
+
Reset to specific branch or tag
+
Select
+ Team -> Reset... on a project. This opens a dialog where you can select a branch or a tag.
+
+
Reset to a specific commit
+
Select a commit in the History view and open the context menu. Here you find the entries
+ Hard reset,
+ Mixed reset and
+ Soft reset.
+
+
Revert all local and staged changes
+
This can be done using a hard reset. If you reset to the current HEAD (normally the last commit on your branch) with the option
+ hard you reset the currently checked out branch to this commit and overwrite the working tree and the index with the content of HEAD. You can do this in three ways:
+
+
+
Select
+ Team > Reset... on a project. In the dialog select HEAD or your current branch and switch the radio button to
+ hard.
+
+
Right click and select
+ Reset... on any branch or tag in the Repositories view. This opens a dialog which lets you decide on the reset type. Choose
+ hard here.
+
+
Open the context menu on the HEAD commit in the history view and select
+ Hard Reset.
+
+
+
+
+
+
Branching
+
General remarks about branches
+
Committing changes to a local repository is impractical without using a local branch (see concepts section above). Furthermore, by using several different branches, it is possible to work on different changes in parallel by switching among these branches.
+
Thus, before starting to change the local repository, the first step is typically to create a local branch. Local branches are "based upon" either a commit or a remote tracking branch.
+
The second option is recommended when working with remote repositories, as it simplifies the task of synchronizing the local changes with the remote ones by adding so-called "upstream configuration" to the new local branch.
Each local branch which is based on a local tracking branch can have some additional configuration indicating the remote repository, the remote branch, and the so-called pull strategy. See
+ Branch Creation dialog for more details.
+
+
Typically, this configuration is created automatically when creating the local branch based on a remote tracking branch. However, it can be displayed and edited in the
+ repository configuration or by clicking
+ Show In > Properties on a branch in the Repositories View.
+
+
Checking out an existing Branch
+
From the team menu on a project node:
+
+
Select
+ Team > Switch To... and select a branch name from the list
+
+
+
If there are too many branches the list does not show all of them. In this case
+
+
Select
+ Team > Switch To... > Other...
+
+
On the dialog, select a branch, a tag or a Reference
+
Click
+ Ok
+
+
+
From the Git Repositories View
+
+
click
+ Checkout on a branch node
+
+
or double click a branch node
+
+
From the History View
+
+
Click
+ Checkout on a commit which has a branch label
+
+
If more than one branch point to the commit a dialog will let you decide which branch to check out.
+
+
Creating a New Local Branch
+
This is always done with the
+ Branch Creation dialog. The newly created branch can optionally be checked out by selecting a check box on the dialog.
+
+
From the team menu
+
+
Select
+ Team > Switch To... > New Branch....
+
+
On the dialog, select a branch, a tag or a Reference.
On the branch selection dialog, select the branch to rename
+
Enter the new branch name and click
+ OK
+
+
+
From the Repositories View
+
+
Open the Git Repositories View
+
Select
+ Rename Branch... or press F2 on the branch you want to rename
+
+
Enter the new branch name and click
+ OK
+
+
+
From the History View
+
+
Select
+ Rename Branch... on a commit with a branch label
+
+
Enter the new branch name and click
+ Ok
+
+
+
Deleting a Branch
+
All the actions below show the same behavior with respect to the following:
+
+
The currently checked out branch can not be deleted
+
If deletion of the branch may result in data loss, a warning is displayed that must be confirmed
+
+
EGit assumes a potential data loss if the branch points to a commit that is not reachable from the currently checked out commit
+
+
+
+
From the Team Menu on a Project node
+
+
Select
+ Team > Advanced > Delete Branch...
+
+
Select the branch to delete from the dialog being displayed and press
+ Ok
+
+
+
From the Repositories View
+
+
Open the Git Repositories View
+
Select
+ Delete Branch on the branch you want to delete
+
+
+
From the History View
+
+
Select
+ Delete Branch on a commit with a branch label
+
+
If multiple branches point to the commit, a selection dialog will be shown on which you can select the branches to delete
+
+
Branch Creation Dialog
+
There are several actions available to create a local branch. All these actions use the Branch Creation dialog:
+
+
+
+
Enter the name of the local branch you want to create. If a source branch is selected which is a remote tracking branch EGit will suggest to create the new local branch with the same name.
+
Click
+ Select... to select the source branch the new branch shall be based on. Typically, this is a remote tracking branch, but it could be any branch or commit in the repository (selecting a local branch is not recommended if you are working with a remote repository).
+ If you want to base the new branch on a commit no branch is referring to then click
+ Create Branch... from the commit shown in the History View.
+
+
When a source branch is selected you can configure the "upstream configuration" of the new branch which is helpful when fetching and pushing, but particularly when pulling. Depending on the selected option the following configuration can be chosen:
+
+
"Merge upstream commits into local branch": When pulling, the changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be merged with the new changes. This is the default if the new branch is based on a remote tracking branch (but this default may be overridden by specific repository configuration)
+
"Rebase commits of local branch onto upstream": When pulling, new changes will be fetched from upstream and the remote tracking branch will be updated. Then the current local branch will be rebased onto the updated remote tracking branch
+
if you uncheck the option "Configure upstream for push and pull"): When pulling, no specific upstream configuration will be done for the new branch; however, if a default remote exists (a remote with name "origin", pull will try to use the configuration of this remote; this is the default if the new branch is not based on a remote tracking branch
+
+
You may view and edit the upstream configuration in the
+ repository configuration or by selecting
+ Show In > Properties on a branch in the Repositories View.
+
+
EGit also supports the git configuration parameter branch.autosetuprebase, set it to always if you want to use the rebase pull strategy by default. If you set this in the repository configuration this is used for all local branches created based on a remote tracking branch in this repository, if you set it in your user configuration it will be used for all your repositories.
+
In the lower part, you can decide whether the new branch shall be checked out immediately.
+
Configure Branch Dialog
+
+
+
+
Click
+ Configure Branch... on a branch in the Repositories View in order to change the upstream configuration of a local branch.
+ Select which remote ("." means the local repository) and branch the selected local branch should track. Check "Rebase" if you want
+ pull to rebase the local branch onto new changes arriving for the tracked branch, otherwise pull will merge new changes arriving for the tracked branch.
+
+
Merging
+
A merge incorporates changes from another branch or tag, since the time their histories diverged from the current branch, into the currently checked out branch.
+
Merging a branch or a tag into the current branch
+
You can trigger merge from:
+
+
the History View
+
the Team menu
+
the Git Repositories View
+
+
Starting merge from the History View
+
This is the recommended view to start a merge since it shows you the history of your repository. Ensure that the toggle buttons
+ Show all changes in repository and
+ Show all Branches and Tags are selected in the History View's toolbar. This ensures that you see the complete history of your repository in order to decide which branch you want to merge. Select the commit with the branch or tag label you want to merge and click
+ Merge.
+
+
Starting merge from the Team menu
+
In the Package Explorer or Navigator, open the context menu on a project node.
+ Select
+ Team > Merge...
+
+
Now the merge dialog opens:
+
+
+
+
On the dialog, select a branch or a tag you want to merge with your current branch. This dialog also allows you to select merge squash and fast-forward options.
+
Starting merge from the Git Repositories View
+
You can trigger a merge from any branch and tag node and from the repository node if you have checked out a local branch. See
+ Merging a Branch or a Tag for further details.
+
+
Merge options
+
The following fast-forward configuration options for merge are recognized by EGit, which are used for all branches:
+
[merge]
+ ff = true|false|only
+
+
+
When you only want to configure it for a certain branch, use the following:
When the merge resolves as a fast-forward, only update the branch pointer, without creating a merge commit. This is the default behavior.
+
+
+
ff = false or mergeoptions = --no-ff
+
Create a merge commit even when the merge resolves as a fast-forward.
+
+
+
ff = only or mergeoptions = --ff-only
+
Refuse to merge and abort the merge operation unless the current HEAD is already up-to-date or the merge can be resolved as a fast-forward.
+
+
When you start merge from the Team menu "Team > Merge..." you can set the fast-forward, squash or no-commit merge options in the merge dialog:
+
+
+
+
Possible merge results
+
After pressing the Merge button, the following scenarios can occur:
+
+
+ Already up to date: Your current branch points to a commit that has the selected branch or tag as predecessor. In this case nothing is changed.
+
+
+ Fast-forward: Your current branch points to a commit that is a predecessor of the selected branch or tag. In this case your branch is moved and points to the selected branch or tag; this new HEAD is checked out to the working tree. Fast-forward is very common when working with remote repositories: When a remote tracking branch is updated, the merge with the corresponding branch generally is a fast-forward. You can perform a pull by fetching the remote branch (e.g. origin/master) and merging it into the corresponding local branch (e.g. master).
+
+
+ Real merge: When neither of the conditions above apply egit triggers a merge of the commits. There are two possible outcomes: If no conflicts occur the current branch will point to a newly created merge commit; if conflicts occur the conflicting files will be marked with label decorators (see
+ Resolving a merge conflict for further actions in case of merge conflicts).
+
+
+
Merge Result dialog
+
The result of a merge is summarized in a dialog:
+
+
+
+
On the first line you see the result of the merge. The possible results are "Already-up-to-date", "Fast-forward", "Merged", "Conflicting" or "Failed". A possible reason for "Failed" may be that there are conflicting changes in the working directory.
+
On the second line you see the new HEAD commit in case of a successful merge (Already-up-to-date, Fast-forward or Merged).
+
In the table you see the commits which were merged.
+
Resolving a merge conflict
+
A merge can result in conflicts which require user action. This is the case when the content of files cannot be merged automatically. These conflicts are marked with a label decoration in the Staging View. Using the Staging View to find the files with conflicts in order to resolve them is handy since the Staging View shows only modified files so that you don't have to wade through all of your resources but only those which might need your attention for resolving the conflicts.
+
+
+
+
Also the conflicting resources are decorated in the navigation trees like Project Explorer or Package Explorer views
select the top level resource showing the red conflict label decorator
+
click
+ Team > Merge Tool
+
+
select the merge mode
+ Use HEAD (the last local version) of conflicting files and click
+ OK
+
+
+
+
+
+
+
the merge editor opens showing the working tree version in the left pane and the version to be merged in the right pane
+
+
+
+
+
+
edit the working tree version until you are happy with it
+
+ Team > Add the merged resource to mark the conflict as resolved
+
+
commit the merge commit via
+ Team > Commit
+
+
+
Manual conflict resolution
+
To resolve a conflict you have to do the following steps:
+
+
Navigate to the conflicting resource
+
Edit the content of the conflicting resource
+
Tell EGit that the conflict is resolved with
+ Team > Add
+
+
Commit the conflict resolution with
+ Team > Commit
+
+
+
Finding conflicting files
+
A repository which contains conflicting files has the textual label decorator "|Conflicts" attached to the repository name. Conflicting resources and folders containing such conflicting resources get a conflict label decoration.
+
+
+
+
Alternativley, it's easy to find a list of all conflicting files in the staging area.
+ Open the
+ Git Staging view. The conflicting files with decorators will be seen
+ on the left.
+
+
+
Open the file in an editor, edit the content and save the editor.
+
Note that this step is not mandatory. EGit does not check the content to decide if a conflict is resolved. The next step is the relevant one.
+
Adding conflict resolution to the git index
+
Once you are finished with editing a file either click
+ Add to Index in the Staging View or click
+ Team > Add to add the conflict resolution to the git index. This will also mark the corresponding conflict as resolved.
+
+
When you have resolved all conflicts the textual repository label decoration changes to "Merged". There are no conflict markers anymore.
+
+
+
+
Committing a merge
+
When the repository is in state "Merged" (as is indicated with the textual label decorator "|Conflicts" attached to the repository name) the merge can finally be committed.
+
In the Staging View you may want to remove the conflict remarks from the standard merge commit message which is generated by the merge operation and update the commit message if necessary. Then click
+ Commit in order to commit the conflict resolution.
+
+
+
+
+
If you want to use the Commit Dialog to commit the conflict resolution click
+ Team > Commit... anywhere in the navigation tree. The commit dialog opens with a slightly different look compared to a normal commit:
+
+
+
The Commit message area is prefilled with a standard merge commit message.
+
It is not possible to amend a previous commit.
+
It is not possible to add untracked files.
+
it is not possible to uncheck the checkboxes. This guarantees that all resolved conflicts are committed.
+
+
After pressing the "Commit" Button the merge is completed.
+
Aborting Merge
+
If a merge resulted in conflicts you can abort the merge with a hard reset to the current branch. This can be done in state "Conflicts" and in state "Merged", i.e. before and after you have resolved the conflicts.
+
The hard reset can be done from the team menu, the Git Repositories View or the History View. See
+ Revert all local and staged changes for more details.
+
+
+
+
+
Rebasing
+
Rebase Introduction
+
Rebase applies a chain of commits onto a given commit. A typical scenario is the development of some feature on a "topic" branch which was created from a "master" branch at some point in time. When "master" is updated with changes e.g. from other developers while "topic" is still under development, it may become necessary to incorporate these changes into "topic".
+
+
+
Let's assume we start development on "topic" by creating the "topic" branch from master. At this point, both "master" and "topic" point to commit "E". When the first commit ("A") is added to "topic", the commit history of the repository looks like this:
+
+
+
A topic
+ /
+ D---E master
+
+
Now, let's assume that there were some more commits on "topic" and as well some more commits on "master" (for example, "master" may track some remote repository and there were some changes in that remote repository that have been pulled into "master"):
+
+
+
A---B---C topic
+ /
+ D---E---F---G master
+
+
Now, in order to incorporate the changes in "master" into "topic", a Rebase of "topic" onto "master" would produce
+
+
+
A'--B'--C' topic
+ /
+ D---E---F---G master
+
+
+ Technically, the sequence of commits that are contained in "topic" but not in "master" are applied (that is, cherry-picked) on top of "master" one by one.
+
+
+
Note that the commits A, B, C are neither lost nor changed, instead a new chain of commits A', B', C' with the same changes and commit messages as the original commits (but different commit IDs) will be created. The old commits A, B, C are still around in the object database but not visible anymore as they are no longer reachable from any branch. A', B', C' are different from the old ones as they now also contain changes F and G.
+
Rebase, A Simple Example
+
Let's have a look at some simple example: we have a text file "FamousWords.txt" which initially might have some content like
+
Chapter 1
+Once upon a time...
+
+Chapter 2
+To be or not to be
+
+
Now, in "topic", two commits are created, the first one adding a French translation to Chapter 2, and another one adding a German translation:
+
After first change in "topic":
+
+
+
Chapter 1
+Once upon a time...
+
+Chapter 2
+To be or not to be
+Être ou ne pas être
+
+
+
After second change in "topic":
+
+
+
Chapter 1
+Once upon a time...
+
+Chapter 2
+To be or not to be
+Être ou ne pas être
+Sein oder nicht sein
+
+
At the same time, the file was changed in "master" by adding two commits adding French and German translations to Chapter 1:
+
+
Now, if "topic" is rebased onto "master", the two changes in topic are applied in the same sequence as they were applied during the evolution of "topic".
+
The result is a merged version of "FamousWords.txt":
+
+
and a commit history with the commit history of "topic" on top of the current "master":
+
+
+
+
+
+
The Real World: Rebase Conflicts
+
Up to now, we have assumed that the changes in "topic" can be auto-merged into "master". In the real world, however, it may happen that you encounter conflicts during rebase. Now, if a commit that is to be cherry-picked contains changes that conflict with changes in "master", the rebase operation is interrupted after applying the conflicting change; the conflicts are visualized in the usual way (with conflict markers) and the user gets a chance to decide whether to
+
+
resolve these conflicts manually,
+
skip the current commit, or
+
abort the rebase completely
+
+
If
+ Resolve Conflicts is chosen, and the conflicts have been resolved manually, the changes must be "Added", and then rebase can be resumed, i.e. the next commit in the chain will be applied.
+
+
If
+ Skip was chosen, the conflicting changes will be reverted and the next commit in the chain will be applied.
+
+
If
+ Abort was chosen, the rebase operation will be completely rolled back, returning the Repository into its original state before the rebase was started.
+ This process is repeated until the last commit was applied successfully or skipped. Finally, the "topic" branch will be changed to point to the last commit.
+
+
To understand "Skip" better, let's look back to the introduction above. If we assume that commit "B" causes some conflicts with the current "master", the user might decide to simply skip "B"; the new commit history after the rebase would then look like this:
+
A'--C' topic
+ /
+ D---E---F---G master
+
+
Starting Rebase
+
+ In the History View:
+
+
+
Checkout the branch you want to rebase
+
Select the commit onto which you want to rebase the checked out branch. This commit will become the new base for all commits being rebased
+
Click
+ Rebase
+
+
+
+ In the Git Repositories View: On Repository nodes,
+ Rebase... opens a dialog asking the user to select a branch that is not checked out; the currently checked out branch will then be rebased onto the selected branch. On "Branch" nodes (both Local and Remote Tracking branches, but not on the currently checked out branch),
+ Rebase immediately rebases the currently checked out branch onto the selected branch:
+
+
+
+
+
Rebase Confirmation Dialog
+
If Rebase was successful, a confirmation dialog will be displayed; this dialog can be suppressed by ticking a checkbox; a preference on the Git preference page allows to make the dialogs appear again. If the dialog is suppressed, an "Information" message is written to the Eclipse log instead.
+
Rebase Conflicts
+
If a conflict occurs during rebase, a dialog is shown giving some information about the commit that caused the conflict. By selecting a radio button, you can decide whether to
+
+
Start the Merge Tool to resolve the conflicts manually
+
Skip the current commit
+
Abort the rebase altogether
+
Do nothing (return to the workbench), this is equivalent to hitting "Escape":
+
+
+
+
+
Unless
+ Skip or
+ Abort was chosen in the dialog, the conflicts must be resolved manually by editing the conflicting files. When done with editing, the files must be declared as being resolved by adding them to the git index.
+
+
If you canceled the rebase wizard the easiest way to find the files with conflicts is using the Staging View. Click
+ Merge Tool on the file with conflicts to open the merge tool for this file.
+ The Merge Tool can also be started from the corresponding entry in the Team menu.
+
+
+
+
+
Edit the file until you are happy with the conflict resolution and click
+ Add to Index on the corresponding entry in the Staging View. This stages the conflict resolution and marks the conflict resolved.
+
+
+
+
+
After all conflicts have been resolved, the
+ Continue operation gets enabled. In order to continue the rebase operation which was stopped due to conflicts click the
+ Continue button in the Staging View or click
+ Rebase > Continue on the repository node in the Repositories View.
+
+
+
+
+
If instead of resolving conflicts you want to skip the commit which caused the conflicts click
+ Skip instead.
+
+
If you want to abort the ongoing rebase operation click
+ Abort. This reverts everything to the state before you started rebase.
+
+
Aborting Rebase
+
As long as the Repository is in "Rebasing" state, the user can always abort the rebase in the Git Repositories View using the menu action "Rebase > Abort" which is available on the Repository node.
+
Interactive Rebase
+
Synopsis
+
+
+
+
Interactive rebase allows to quickly edit a series of commits using the following actions defined in a rebase plan:
+
+
+ pick to define the order of commits, moving pick entries enables reordering
+
+
+ skip to remove a commit
+
+
+ edit to amend a commit
+
+
+ reword to edit a commit's message
+
+
+ squash to squash a commit with its predecessor commit and including their commit messages
+
+
+ fixup to squash a commit's diff into its predecessor discarding the squashed commit's message
+
+
+
+ Warning: don't rewrite commits you have already published on a remote repository, it's considered a bad practice for all but experimental or review branches since your colleagues may have already based their work on these published commits and you would force them to also rewrite their changes. Though it's a tool frequently used on review branches e.g. when using Gerrit to rework changes which have to be improved based on review feedback.
+
+
Starting interactive rebase
+
First checkout the local branch (here branch
+ toRebase) containing the commit series you want to edit. Then open the History View for this repository and click
+ Interactive Rebase on the commit preceding the oldest commit you want to rewrite. Often this is the one origin/master points at.
+
+
+
+
+
This opens the new view
+ Git Interactive Rebase showing the rebase plan populated with the commits to be modified in topological order in the sequence they will be processed during the rebase operation.
+ The initial action for all commits is
+ Pick which would cherry-pick the corresponding commit. Note that EGit also rewinds HEAD to the commit preceding the first one in the edit list in order to prepare the repository for rebasing.
+
+
+
+
+
Planning rebase
+
Here the initial rebase plan, the first commit to be applied on the rewound HEAD comes first and then all the other commits to be rebased in the order they will be applied when clicking "Start".
+
+
+
+
Next we prepare the rebase plan, moving commits up and down using the arrow buttons to reorder commits and choosing the rebase action we want to apply on the commits we want to tweak.
+
In this example I first reordered the commits so that the implementation of new calculator operations immediately precedes the commit implementing tests for the respective operation.
+
+ Here what I want to modify in this series of commits:
+
+
I want to skip commit "TODO list" since it contains a private todo list I used while implementing the operations and I don't need this anymore.
+ I need to amend commit "Add divide operation" since it's buggy, this was revealed by the corresponding test which was implemented in a later change, hence I select action
+ Edit here
+ the commit "Add multiply opration" obviously has a typo in the commit message header so I choose
+ Reword.
+ I want to squash commit de7647b into its predecessor since it doesn't make sense to have the JavaDoc fix separate from the implementation of what it describes, hence I choose
+ Squash to squash it with its predecessor.
+
+
+
+
+
Executing interactive rebase
+
When you're done planning the rebase click
+ Start to start execution of the rebase command. EGit will process the plan and stop at the commits where you have selected actions which need your intervention to interactively edit the corresponding commit.
+
+
In our little example rebase stops the first time on commit "Add divide operation" since we signaled that we want to edit it. The last picked commit is highlighted in bold. At this time the first step skipping the commit "TODO list" was already processed and this commit is no longer in our commit series we are rewriting while executing rebase. Also the commit "Add divide operation" was already cherry-picked since we want to amend it. Note that EGit has already selected the "Amend" option in the Staging View in order to prepare amending this commit.
+
+
+
+
Now we fix the bug in this commit, stage the changes needed to fix the bug, adjust the commit message if necessary and click
+ Commit in order to amend the buggy commit.
+
+
+
+
+
Let's have a look at the History View to see the resulting commit graph. HEAD now points at the rewritten fixed commit "Add divide operation", note that its SHA1 is different from its original version since we rewrote the commit to fix the bug.
+
+
+
+
Next we click
+ Continue in order to resume processing the rebase plan. Rebase picks the commits "Divide test" and "Add multiply opration" and stops again raising a commit message editor so that we can fix the typo in the commit message of the latter commit.
+
+
+
+
+
Edit the commit message to fix the typo and click
+ OK in order to amend the commit message and resume processing.
+
+
Rebase picks the next 3 commits, squashes the commits "add power" and "Fix javadoc for power operation" into one new commit and stops again so that we can prepare the commit message of the new commit. Its initialized with the concatenation of the messages of the commits being squashed.
+
+
+
+
Edit the squashed commit's message and click
+ OK to resume processing.
+
+
+
+
+
Rebase picks the final commit "Power test" and completes successfully.
+
+
+
+
Finally lets have another look in the History View to examine the result of the interactive rebase command. Compare the rewritten series of commits now contained in branch "toRebase" with the old commit series still visible since I have placed another local branch "start" there in order to keep the old series visible.
+
+
+
+
Safety Instructions
+
If you happen to go wrong during this multi-step process you can always hit
+ Abort in order to stop the rebase operation in progress and roll back to the starting point.
+
+
When you are starting to use this feature it's maybe a good idea to place a second local branch on the starting point (as I showed in this example) to make it more obvious what's going on until you are familiar with this powerful git command.
+
Rebase with auto-stashing
+
EGit also supports the Git configuration option
+ rebase.autostash. Set this option
+ rebase.autostash = true to automatically create a temporary stash before a rebase operation begins, and apply it after the operation ends. This means that you can run rebase and also interactive rebase on a dirty worktree. However,
+ use with care: the final stash application after a successful rebase might result in non-trivial conflicts.
+
+
Cherry Picking
+
Cherry-pick Introduction
+
A given commit
+ C on branch
+ stable-1.0 contains a set of changes you would like to integrate in your current development on branch
+ master.
+
+
A--B--C--D stable-1.0
+ /
+ D---E---F---G master HEAD
+
+
Cherry-pick the commit
+ C to create a new commit
+ C' on top of the head commit of the currently checked out branch
+ master.
+ C' will then contain the changes performed in
+ C applied onto the HEAD of the currently checked out branch
+ master.
+
+
A--B--C--D stable-1.0
+ /
+ D---E---F---G--C' master HEAD
+
+
Cherry-pick Example
+
You are currently working on branch "feature2" (HEAD). There is a commit "feature 1" in another branch.
+
+ You want to integrate the changes performed by commit "feature 1" into your current development on branch "feature 2".
+
+
+
In the History View select commit "feature 1" and click
+ Cherry-pick:
+
+
+
+
+
+
+
As result you get a new commit "feature 1" at the tip of your current branch "feature" containing the changes of "feature 1":
+
+
+
+
+
+
Cherry-picking can encounter conflicts. In this case conflict markers are rendered into the affected sources:
+
+
+
+
+
+
Open the Staging View to quickly find the conflicting files.
+
Click
+ Merge Tool on a file with conflicts to open the merge tool for this file
+
+
Resolve the conflicts by editing the corresponding sources in the same way as described in
+ Resolving a merge conflict
+
+
+ Add the files you edited to mark the conflicts resolved
+
+
+ Commit the conflict resolution
+
+
+
+
+
+
Tagging
+
Creating a Tag
+
+
Open the History View and click
+ Create Tag... on the commit you want to tag
+
+
+
+
+
+
+
Enter the tag name
+
Enter the tag message
+
Click
+ OK to create the annotated tag
+
+
+
To create a
+ lightweight tag storing neither message nor author information leave the tag message empty.
+
+
Tags can also be created from the team menu, click
+ Team > Advanced > Tag..., enter the tag name and message, select the commit you want to tag (default is HEAD) and click
+ OK.
+
+
Replacing an Existing Tag
+
What to do if you tagged the wrong commit or ended up with some sort of typo ?
+
+
If you didn't yet push this out just replace the tag and you are done.
+
+ If it's already published you shouldn't replace the tag but use a new name since otherwise you have to tell everybody who got the old tag to replace it manually with your updated one. This is because, Git does not (and it should not) change tags behind users back. So if somebody already got the old tag, doing a git pull on your tree shouldn't just make them overwrite the old one.
+
+
+
So if your old tag wasn't yet pushed you may correct it in the following way :
+
+
In the History View click
+ Tag... on the commit you want to place the tag on
+
+
+
+
+
+
+
Select the tag you want to replace from the list of existing tags
+
or start typing any part of the tag you look for into the Tag Name field, this will filter the list of existing tags to those tags which contain the string you are typing, then select the tag you want to replace
+
Mark the checkbox
+ Force replace existing tag
+
+
Change the tag and press
+ OK
+
+
+
You can also change annotated tags into lightweight tags by removing the message or vice versa by adding a message.
+
Deletion of tags
+
In order to delete a tag, select the tag to be deleted and click
+ Delete Tag.
+
+
+ Note: it's a bad practice to delete tags which have already been published on a public server, some Git servers even disallow tag deletion to ensure traceability for releases which are usually tagged. Also see the
+ section "On re-tagging" in the Git reference documentation of the tag command.
+
+
Light-weight and Signed Tags
+
Light-weight tags are shown in the Repositories View as well as in the Create Tag dialog. Tags are shown with a blue icon in the Repositories View; annotated tags are decorated with a yellow person icon.
+
+
+
+
In the History View, tags are shown as yellow labels.
+
+
+
+
Signed tags are not yet supported by EGit, use command line
+ git tag -s instead.
+
+
+
+
+
Patches
+
Creating Patches
+
"A patch is a piece of software designed to fix problems with, or update a computer program or its supporting data" (
+ wikipedia). A patch file contains a description of changes of a set of resources which can be automatically applied to another eclipse workspace or git repository.
+
+
The patch formats used by eclipse (
+ Team > Apply Patch) and by git (
+ git apply or
+ git am on the command line) are different. It is possible to create both types of a patch in EGit.
+
+
Create a Patch from a Commit
+
This is the most common use case for a distributed versioning system. A developer commits a change on a local feature or bugfix branch and wants to export this change into a patch file.
+
It can be done from the history view:
+
+
+
+
The patch file will contain the difference between the commit and its parent in the history view. Note that the filter of the history view applies also for patch creation.
+
Patch Wizard
+
The Wizard consists of two pages. Page one lets you select the location of the patch:
+
+
+
+
The name of the patch file is created from the first line of the commit message.
+
On the second page you can change the patch format.
+
Currently there is one check box:
+ Export in git patch format.
+
+
+
If you do not check it (this is the default) the patch can be applied with the eclipse
+ Apply Patch... wizard. The paths are relative to the eclipse projects and do not contain prefixes (like
+ git format-patch --no-prefix on the git command line).
+
+
If you check it the patch will look like the result of
+ git format-patch --no-stat on the git command line.
+
+
+
Binary diffs are currently not produced.
+
Applying Patches
+
Currently EGit isn't able to apply patches in git format. It is possible to apply patches using the standard Eclipse (unified diff) format using
+ Team > Apply Patch.... Git patches may contain non-standard extensions for rename and binary diffs. The current version of EGit does not generate these extensions.
+
+
+
+
+
Managing Repositories
+
The "Git Repositories View" is the primary UI element to facilitate working with multiple Repositories simultaneously (i.e. within one Eclipse Workspace).
+
This view can be opened using the menu path
+
+ Window > Show View > Other... > Git > Git Repositories
+
+
It is also part of the "Git Repository Exploring" perspective available using menu path
+
+ Window > Open Perspective > Other... > Git Repository Exploring
+
+
If you already have projects in your workspace which are shared with a Git Repository, you can use
+
+ Team > Show in Repositories View
+
+
on any resource to open the view.
+
Adding Repositories to the Git Repositories View
+
Initially, the Git Repositories View is empty. In order to add Repositories to it, there are several options:
+
+
Adding a Repository from the Local File System manually
+
Cloning a Repository and having the cloned Repository added to the view automatically
+
Creating a Repository on the Local File System
+
Adding a Repository by pasting a Git Repository path to the view
+
+
Adding a Repository manually
+
You can add a Repository from your local file system to the Git Repositories View without cloning it. This can be helpful if you are setting up a new Eclipse workspace and want to re-use your Git Repositories. Use the
+ Add an existing Git Repository button from the view's toolbar:
+
+
+
+
+
A dialog will appear prompting you for a directory of your local file system. After selecting the correct directory, you can hit the
+ Search button to see a list of Git Repositories in this directory. You can then select some or all found Repositories and add them to the view using
+ OK:
+
+
+
+
+
Cloning a Repository
+
In order to clone a Repository, refer to
+ Cloning remote Repositories. After a successful clone operation, the newly cloned Repository should appear in the Git Repositories View automatically.
+
+
You can also use the
+ Clone a Git Repository button from the view's toolbar to start the Clone wizard:
+
You can create a new, empty repository on the local file system. This is useful if you later on want to create one or more new projects below this repository. Another usecase is to create a new bare repository where you can push to. Use the
+ Create a new Git Repository button from the view's toolbar:
+
+
+
+
+
A dialog will appear which lets you choose a directory:
+
+
+
+
If you select the checkbox
+ Create as Bare Repository the new repository will not have a working directory. You then can only add content by pushing changes from another repository.
+
+
Adding a Repository using Copy and Paste
+
As a shortcut, it is also possible to paste the local file system path of a Git repository from the clipboard into this view. In order to do so, copy the path of a Git repository (the full path of its .git folder) to the clipboard, then open the context menu on the view panel:
+
+
+
+
or click
+ Edit > Paste from the main menu (or the corresponding keyboard shortcut). If the clipboard content is not suitable, an error popup will be displayed, otherwise the added Repository should appear automatically.
+
+
After the view has been populated with some repositories, it should look like this:
+
+
+
+
Removing Repositories
+
Removing a Repository from the Repositories View
+
In order to remove a repository from the Repositories View select a repository and click "Remove Repository"
+
+
+
+
Deleting a Repository
+
In order to delete a repository, select it in the Repositories View and click "Delete Repository".
+
+
+
+
Then confirm that you want to delete the repository and decide if you want to delete the repository's working directory with the projects contained in the repository from the Eclipse workspace.
+
+
+
+
+ Attention: deleting the working tree (second checkbox) along with the repository (the .git directory; first checkbox) of course removes everything contained in that working tree directory. This includes Eclipse projects that were ever shared (see
+ Adding a project to version control) with that git repository, even if later disconnected (
+ Team→Disconnect)! Sharing a project copies it into the git working tree; disconnecting it does
+
+ not
+ copy it back.
+
+
Structure of the Git Repositories View
+
The following screenshot shows the topmost two levels of the Git Repositories View:
+
+
+
+
The root node represents the Repository itself. The node text indicates the name of the Repository and its location in the local file system. The "Branches" and "Tags" nodes allow browsing and manipulation of tags and branches. The "References" node lists other references which are not branches or tags, most notably the "HEAD" and "FETCH_HEAD" symbolic references (see
+ Git References).
+
+
The "Working Directory" node displays the location and structure of the working directory on the local file system (only in case of a development, or non-bare Repository, for bare Repositories, this node is always a leaf).
+
Finally, the "Remotes" node allows browsing and manipulating the remote configurations used for Fetch and Push.
+
Repository Groups
+
The repositories shown in the Git Repositories View can also be organized into groups. Groups are like logical folders; they are a purely visual structuring aid: moving a repository into or out of a group does not move the repository on disk. A group does not have a folder on the disk.
+
+
+
+
Repository groups can be created via the context menu, sub-menu "Repository Groups", or via the view menu, entry "Create Repository Group...". Repositories can be moved into or between groups by drag'n'drop or via the context menu. Dragging a repository from a group into the white unused area of the view moves the repository out of the group, back to top-level. Groups can be renamed or deleted via the context menu. Deleting a group never deletes the repositories contained, those just go back to the top level. Nested groups are not supported.
+
Functions of the Git Repositories View
+
Project Import
+
In order to work with the contents of a Git Repository, its files and folders must be imported into the Eclipse workspace in the form of projects. While the Git Clone wizard allows to do such imports directly after cloning, the Git Repositories View allows to trigger project imports independently of the clone operation.
+
The "Import Projects..." context menu is available on the "Repository" node as well as on any "Folder" node within the "Working Directory" node and the "Working Directory" node itself:
+
+
+
+
The rationale for offering the
+ Import Projects... action on several nodes is that some of the wizards used for importing projects can take the file system directory into account, for example the
+ Import Existing Projects wizard. If the import is started from the "Repository" or the "Working Directory" node, the working directory of the repository is set as context, otherwise the directory corresponding to the currently selected "Folder" node.
+
The "Branches" node allows to create, browse, checkout and delete local and remote branches. The "Tags" node allows to browse and check out tags. Both the "Branches" node and the "Tags" node allow to merge the branch or tag into the currently checked out branch and also to synchronize with the currently checked out branch.
+
For better readability, branches are organized in two sub-nodes for local and remote branches, respectively, and only the shortened names are displayed, e.g. instead of "refs/heads/master" you would find an entry "master" under the "Local Branches" node, instead of "refs/remotes/origin/master" the shortened name "origin/master" is displayed under the "Remote Branches" node. Similarly, tag names are shortened by omitting the "refs/tags/" prefix:
+
+
+
+
Check-out of Branches and Tags
+
Branches and tags can be checked out by either double-clicking on the respective node or by selecting the corresponding context menu entry.
+
Creation and Deletion of Branches
+
Local branches can be created using the
+ Branch Creation Dialog. The wizard is opened by right-clicking on the "Branches", the "Local Branches" on any "Branch" and "Tag" node).
+
+
Branch deletion is done using the corresponding context menu entry.
+
Rebasing
+
You can trigger rebasing of the currently checked-out branch onto another branch by right-clicking
+ Rebase on any (local or remote tracking) branch node.
+
+
Merging a Branch or a Tag
+
You can trigger a merge from any branch and tag node and from the repository node if you have checked out a local branch. See
+ Merging for further details of the merging features.
+
+
+
When you select any branch node other than the currently checked out branch or any tag node, use
+ Merge to directly trigger a merge into the currently checked out branch.
+
+
+
+
When you select the repository node or the currently checked out branch, use
+ Merge... to open the merge dialog. The merge dialog is described at
+ Merging a branch or a tag into the current branch.
+
+
+
Synchronizing with a Branch or a Tag
+
You can perform a comparison of the changes in your HEAD with the changes done in any other branch or tag. Right click and select
+ Synchronize... on any branch or tag. Then the eclipse synchronize view opens which contains a representation of the changes that are contained in your HEAD but not on the other branch or tag (outgoing change) or vice versa (incoming change). Please refer to the documentation of the synchronize feature for further details.
+
+
Determining the Checked-out Branch
+
There are two ways to determine which branch or tag is currently checked out: the checked out branch/tag node is decorated with a little check mark and the "HEAD" entry under the "Symbolic References" node shows the (full) name of the checked out branch:
+
+
+
+
Resetting to a Branch or a Tag
+
Right click and select
+ Reset... on any branch or tag. This opens a dialog which lets you decide on the reset type. See
+ Resetting you current HEAD for further details.
+
+
"Detached" HEAD
+
If HEAD is "detached", i.e. is not pointing to the tip of a local branch but to a commit or tag, then none or several "checked-out" markers may appear in the tree, since any number of remote branch or tags may point to the currently checked out commit. The state you are in while your HEAD is detached is not recorded by any branch (which is natural --- you are not on any branch).
+
Inspecting References
+
The References node displays some References other than branches and tags (the list is dynamic and depends on the current state of the Repository):
+
+
+
+
If the Reference is symbolic, i.e. points to another Reference, the name of the target reference is shown, followed by the object ID of the reference's target. If the Reference is not symbolic, only the object ID is shown.
+
In the example above, HEAD is a symbolic Reference pointing to branch "refs/heads/master" (i.e. branch "master" is checked out", while FETCH_HEAD points directly to commit 226a7f... .
+
The following actions are available on right-clicking on a Reference:
+ Checkout (unless the Reference is already checked out) and
+ Create Branch
+ ... .
+
+
Browsing the Working Directory
+
The "Working Directory" node visualizes the local file system structure of the Git Repository. It is also possible to open a text editor on the files:
+
+
+
+
Alternatively, files can be opened by dragging them from the Working Directory to the Editor Area.
+
Also, on all file and folder nodes as well as on the "Repository" node, an option is offered to copy the (file-system specific) path to the clipboard. This is sometimes useful when the path is needed, for example to open a directory using a file browser or to copy and paste Repositories between view instances (see above about how to add Repositories to the view). The
+ Copy to Clipboard action is also available using
+ Edit > Copy (or the corresponding keyboard shortcut).
+
+
Repository Configuration
+
Integration with the generic "Properties" view in Eclipse allows to view and edit the Git Configuration (global and repository-specific configuration). If the "Properties" view is open, it is updated automatically when a "Repository" node is selected. With a drop down box (left red box in the screen shot) you can switch between the display of the Repository Configuration, the Global Configuration and a view which aggregates both. If the view displays the Repository Configuration or the Global Configuration you can open an editor dialog with the
+ Edit button (right red box in the screen shot). The editor dialog has the same functionality as the preference page
+ Team > Git > Configuration.
+
+
In the Git Repositories view, there is a
+ Properties action in the context menu, which will open a configuration dialog allowing to edit the Repository Configuration. Here, key value pairs can be added, changed or deleted. The
+ Open button allows to open the Repository Configuration file in a text editor.
+
+
Remote Repositories
+
The "Remotes" node allows for browsing and editing Remote configurations. Each Remote configuration has a name and either a Push Specification, a Fetch Specification, or both. If a "Remote Configuration" node or any of its children is selected, the
+ Properties view will show a summary of the Remote configuration. In this example: there is a Remote configuration named "origin" which only has a Fetch Specification, but no Push Specification:
+
+
+
+
+
Menu actions are provided to add, configure, and remove Remote configurations and Fetch and Push Specifications.
+
Direct Fetch and Push Support
+
It is possible to execute fetch and push directly (i.e. without a wizard) on the remote node as well as on the respective "Fetch" and "Push" nodes:
+
+
+
+
Note that the fetch or push operation will be executed immediately in an asynchronous job; on completion you will get a confirmation pop-up displaying the fetch result.
+
The "Fetch" node contains a so called fetch specification and the "Push" node contains a so called push specification.
+
A default fetch specification is created when the repository is cloned. You can edit the fetch specification with the menu entry
+ Configure Fetch.... This opens a wizard. On the first page you can edit the Fetch URI. Ob the second page you can determine the fetch ref specifications, see
+ Fetch Ref Specifications.
+
+
You can create or edit a push specification with the menu entry
+ Configure Push.... This opens a wizard. On the first page you can edit the Push URIs. If a fetch is specified the fetch URI is automatically included into the push specification and no additional Push URI is needed. On the second page you can determine the push ref specifications, see
+ Push Ref Specifications.
+
+
Adding a Remote Configuration
+
This is done using a context menu action on the "Remotes" node. A wizard is started asking for the name of the new configuration and whether to configure Fetch, Push, or both:
+
+
+
+
If the
+ Configure Fetch checkbox was selected, the next wizard page will ask for the URI of the Repository to fetch from:
+
+
+
+
+
Click
+ Change... to open a dialog that allows you to select a URI. The next step is to define the Remote Specification for the fetch URI. See
+ Fetch Ref Specifications about the details.
+
+
If the
+ Configure Push checkbox was selected, the next wizard page will ask for the URIs of the repositories to push to. This is actually a list, as you can push to multiple repositories at once. Click
+ Add.... to add URIs to the list using the same dialog as above. You can remove URIs by marking them in the list and hitting
+ Remove. This step is completely optional if there is already a fetch URI defined. In this case, the fetch URI will also be used for push. If at least one push URI is defined in this steps, it will override the fetch URI. In this example, there is already a fetch URI, so the
+ Next button is enabled, even though there is no Push URI in the list:
+
+
+
+
+
The next step is to define the Remote Specification for the push URIs. See
+ Push Ref Specifications about the details.
+
+
Upon completion, the new Remote configuration will be visible:
+
+
+
+
Changing Remote Configurations
+
It is also possible to add, remove, or change Fetch/Push Specifications for an existing Remote configuration using the context menu.
+
Gerrit Configuration
+
If you work with
+ Gerrit Code Review as remote repository server you can
+
+
+
specify the push configuration used to push changes to code review
+
specify the fetch configuration to fetch the review notes from Gerrit
+
configure your repository to select the
+ Compute Change-Id for Gerrit Code Review option in the Commit dialog by default
+
+
+
Select
+ Gerrit Configuration... from the context menu of a Remote. This opens a wizard with one page:
+
+
+
+
+
+
When you click
+ Finish the wizard sets the repository configuration parameter
+ gerrit.createchangeid to
+ true. This ensures that the checkbox
+ Compute Change-Id for Gerrit Code Review in the Commit dialog is selected by default. See
+ Commit Message for details.
+
+
+
+
If you want to configure automatic Change-Id insertion at a later point in time you may use the repository configuration editor (
+ Preferences > Team > Git > Configuration) to set the configuration parameter
+ gerrit.createchangeid to true. If you want this configuration for all your repositories you may put it into ~/.gitconfig then you don't need to repeat this configuration for every new repository you happen to work on.
+
+
+
+
Additionally the wizard adds a refspec "refs/notes/*:refs/notes/*" to your fetch specification. Gerrit stores data about the review in git notes. With this refspec these review data will be fetched automatically when you fetch from this remote and they will be displayed in the commit viewer.
+
+
+
In the section
+ Push URI you can configure the URI which is used for the default push configuration. It is pre-filled depending on the URI you are cloning from. If you clone with the git protocol, the protocol is automatically changed to ssh, and the default Gerrit ssh port 29418 is automatically added. For protocols which require a user there is a user field for convenience.
+
+
+
+
The section
+ Push Configuration has one field,
+ Destination Branch. Here you should enter the name of the target branch where changes accepted in the Gerrit code review workflow will be submitted to. This yields an entry HEAD:refs/for/<branchname> in the push configuration of the remote you specified in the clone wizard.
+
+
+
+
Repositories which have been configured for Gerrit are displayed with the green Gerrit decorator
+
+
+
+
+
Refresh
+
The view is auto-refreshed periodically. The
+ Refresh button in the toolbar allows to trigger an immediate refresh:
+
+
+
+
+
Link with Selection
+
If the
+ Link with selection toggle is enabled, the file or folder corresponding to the current workbench selection will be displayed automatically:
+
+
+
+
+
Link with Editor
+
If the
+ Link with editor toggle is enabled, the file or folder corresponding to the currently active editor will be displayed automatically:
+
+
+
+
+
Hierarchical Branch Layout
+
If the
+ Hierarchical Branch Layout toggle is enabled, branches will be shown in a hierarchical layout using slash (/) as hierarchy separator:
+
+
+
+
+
This can be helpful for organizing large numbers of branches.
+
Bare Repositories
+
"Bare" Git Repositories (as opposed to "development" or "standard" Repositories) have no working directory by definition, so all actions related to the working directory (check-out, project import, browsing the working directory) are not available for such Repositories. The "Bare-ness" of a Repository is visualized on the "Working Directory" node, which is always a leaf:
+
+
+
+
Bare repositories are only changed by pushing changes to them.
+
Removing Repositories from the Git Repositories View
+
This is offered as a menu action on the "Repository" node. Note that this does not delete the Repository, but just removes the node from the view. If there are projects in the workspace which are located in the working directory of the Repository, the user will be prompted to confirm deletion of these projects from the Eclipse workspace.
+
Showing Repository in Related Views
+
Show in History
+
The command
+ Show in > History will open the
+ History View showing all changes in the selected repository.
+
+
Show in Reflog
+
The command
+ Show in > Reflog will open the
+ Git Reflog view showing the Git reflog of the selected repository.
+
+
Show in Properties
+
The command
+ Show in > Properties will open the
+ Properties view showing the properties of the selected repository.
+
+
+
+
+
Working with Tasks
+
The EGit integration with Mylyn was moved to Mylyn in Eclipse 2023-06. See
+ mylyn.egit.
+
+
Viewing Commits
+
The Egit commit viewer allows commits to be opened in the Eclipse editor area.
+
The EGit commit viewer displays the following commit information:
+
+
Commit tab
+
+
Links to open parent commits
+
Author
+
Committer
+
Message
+
List of tags pointing to this commits
+
List of branches that the commit exists on
+
+
+
+
+
+
+
+
Diff tab
+
+
Read-only text editor with the output of the file differences, with a content outline linked to the editor.
+
The colors used in the viewer for highlighting lines can be configured from the
+ Preferences >
+ General >
+ Appearance >
+ Colors and Fonts >
+ Git folder.
+
+
The overview ruler right of the editor's text viewer shows colored annotations for all added or removed lines.
+
Quick navigation between "hunks" (changes with added or removed lines) is available via clicking on an annotation in the overview ruler, or via the "Go To Next Annotation"/"Go To Previous Annotation" actions in the global Eclipse toolbar (default keyboard shortcuts are "Crtl/Cmd-." and "Shift-Ctrl/Cmd-.").
+
Line numbers in hunk headers, as well as the file names in file diff headers are hyperlinks to open the old or the new version or also the current working tree version in an editor, or to show a two-way diff between the old and the new version. The latter is also available on the word "diff" in a file diff headline (the one starting with "diff --git"). These links are only available if applicable; for instance there will be no link to open the old version for an added file since there was no old version in this case.
+
+
+
+
+
+
+
+
Notes tab
+
+
All Git notes for the commit
+
+
+
+
+
+
+
Tagging a commit
+
+
Select the Create Tag icon from the commit viewer toolbar
+
+
The Tag dialog will open allowing you to create a tag from the commit.
+
+
+
+
Creating a branch from a commit
+
+
Select the Create Branch icon from the commit viewer toolbar.
+
+
The Branch dialog will open allowing you to create a new branch from the commit
+
+
+
+
Checking out a commit
+
This checks out the commit displayed in the commit viewer. The commit will be checked out and
+ HEAD will become detached.
+
+
Cherry picking a commit
+
Applies the change introduced by the commit displayed in the commit viewer on top of the currently checked out commit or branch.
+
Opening the commit viewer
+
The commit viewer can be opened from the following places:
+
+
History view table context menu
+
Double-clicking commits in the Pull/Fetch dialog results table
Commits can be searched from the
+ Git Search tab in the standard Eclipse Search dialog.
+
+
This dialog supports searching for text or patterns present in the different fields of a Git commit such as the message, author line, committer line, and the SHA-1 ids of the commit, its parent(s), and the tree associated with it.
+
+
+
+
Browsing Search Results
+
Commit search results are displayed in the standard Eclipse Search view. Results are grouped by repository when in Tree mode. Double-clicking a commit from the Search view will open it in the
+ commit viewer.
+
+
+
+
+
Launching Git Search
+
The Git Search page can be opened by selecting the Git Search option from the Search drop-down on the Eclipse toolbar.
+
+
+
+
Open commit dialog
+
EGit has an
+ Open Git Commit dialog similar to the Mylyn
+ Open Task and core'
+ Open Resource' dialogs. The dialog searches every configured Git repository for the branch, tag, or commit SHA-1 entered into the filter box and displays the matching commits.
+
+
+
+
+
The dialog can be opened by selecting the
+ Open Git Commit button on the Eclipse navigation toolbar.
+
+
+
+
+
Finding the author of each line in a file
+
EGit supports showing
+ git blame information inside the editor ruler.
+
+
Selecting the
+ Team >
+ Show Revision Information action on file selections will open the editor and display an annotation ruler with commit and author information for each line in a file. Hovering over the ruler will display a pop-up showing the commit id, author, committer, commit message and the diff applied by this commit on the selected hunk.
+
+
The look and feel of the blame annotation editor ruler can be configured from the
+ Revisions sub-menu available from the ruler context-menu.
+
+
+
+
+
Click
+ open commit to open the commit in the
+ commit viewer, click
+ show in history to show the commit in the History View. Click
+ show annotations to show annotations of the parent commit of the commit shown in the hover.
+
+
Working with Submodules
+
You can read more about what Git submodules are and how they work in this
+ Git Community Book chapter.
+
+
Cloning Repositories with Submodules
+
Submodules are repositories nested inside a parent repository. Therefore when doing a clone of a parent repository it is necessary to clone the submodule repositories so that the files/folders are available in the parent repository's working directory.
+
Checking the
+ Clone Submodules button from the
+ Git Clone wizard will clone all submodule repositories after the clone of the parent repository finishes.
+
+
+
+
+
Browsing Submodules
+
There is a
+ Submodules node displayed in the
+ Git Repositories view for repository's that contain submodules.
+
+
All submodules in the given parent repository are displayed under this node as well as information about what commit is currently checked out.
+
+
+
+
Adding a Submodule
+
You can add a new submodule to a repository by selecting a repository in the
+ Git Repositories view and selecting the
+ Add Submodule context menu option.
+
+
The wizard will prompt for the path and URL of the submodule being added. The path entered will be relative to the parent repository's working directory and the URL will be used to clone the repository locally.
+
Once the wizard is completed the submodule will be cloned, added to the index, and the submodule will be registered in the
+ .gitmodules file as well as in the parent repository's
+ .git/config file.
+
+
Updating Submodules
+
There are two actions that can be used to update submodules,
+ Update Submodule and
+ Sync Submodule.
+
+
Selecting the
+ Update Submodule action on a submodule will check out the commit referenced in the parent repository's index for that submodule. This command will also perform a merge or rebase if that has been configured in the
+ update field for the selected submodule's configuration section in the parent repository's
+ .git/config file.
+
+
Selecting the
+ Sync Submodule action on a submodule will update the remote URL used by the submodule from the current value in the
+ .gitmodules file at the root of the working directory of the parent repository.
+
+
Team Project Sets
+
Team project sets (.psf files) are supported by the Git team provider.
+
Import
+
To import an existing project set, use the
+ Import... wizard and then select
+ Team Project Set from
+ Team.
+
+
You can then select a file which contains the import definitions and optionally choose to add imported projects to a working set.
+
In the next step, the repositories are cloned, the projects imported and connected. This can take a while depending on the size of the repositories.
+
Export
+
To create a project set file for existing Git projects, select the projects/working sets which are already connected to the Git team provider.
+
Then open the
+ Export... wizard and select
+ Team Project Set from
+ Team. There you can choose to export working sets or projects only and can refine your selection. In the next step, select an output path and finish the wizard.
+
+
Format
+
You can also manually edit a .psf file. Each project has an entry which looks like this:
The values are separated by commas and have the following meaning:
+
+
Format version
+
Git repository URL
+
Name of branch to initially check out
+
Path to the project to import (folder which contains .project), relative to the repository
+
+
Each project has one entry. So for multiple projects in the same repository, create such an entry for each project with the same repository URL. The import is smart enough to only clone each repository once.
+
If the repository contains a project at the root, use . as the project path.
+
GIT LFS Support
+
Partial support for GIT LFS is included in EGit when the optional JGit LFS support bundle "Java implementation of Git - optional LFS support" is installed. This support works best when using the SSH protocol with a capable LFS remote (i.e. GitHub or Gerrit with LFS plugin).
+
To enable usage of EGit's LFS support, either enable it globally (for the current user) by pressing the "Enable LFS support globally" button:
+
+
+
+
... or configure Eclipse to automatically make sure the LFS support is enabled whenever Eclipse starts up. Check the "Automatically configure LFS..." checkbox:
+
+
+
+
... or - to enable builtin LFS support only for a single repository - right click a repository and select "Enable LFS locally"
+
+
+
+
Note that if the JGit LFS support has not been installed some actions are disabled. If LFS support is already enabled in a more global scope the "Enable LFS locally" action is not displayed.
+
Once LFS support is enable directly or indirectly for a repository, you can work as usual with files, more specifically these use cases should work:
+
+
Fetching LFS objects from a LFS Server (note that HTTP authentication is not implemented yet, so SSH works best, as this provides a mechanism to authenticate).
+
Pushing LFS objects to an LFS Server (same note about HTTP authentication applies).
+
Staging and committing files which are managed by LFS (through .gitattributes).
+
Checking out files managed by LFS
+
Viewing LFS managed file's content from the GIT history
+
Comparing actual file content for LFS managed files from the history
This document is maintained in a collaborative wiki. If you wish to
+ update or modify this document please visit
+
+ https://wiki.eclipse.org/EGit/User_Guide
+
If you're new to Git or distributed version control systems generally, then you might want to read
+ Git for Eclipse Users first. More background and details can be found in the on-line book
+ Pro Git.
+
Many of the configurations you will make in Eclipse are found in the Preferences Dialog. To open the Preference Dialog click
+ Window > Preferences in the menu bar at the top. To see the preferences for git, click
+ Team > Git in the tree on the left.
+
+
Basic Tutorial: Adding a project to version control
+
Configuration
+
Identifying yourself
+
Whenever the history of the repository is changed (technically, whenever a commit is created), Git keeps track of the user who created that commit. The identification consists of a name (typically a person's name) and an e-mail address. This information is stored in file ~/.gitconfig under dedicated keys.
+
+
+
EGit will ask you for this information when you create your first commit. By default, this dialog is shown only once until you create a new workspace or tick the checkbox "Show initial configuration dialog" on the Git Preference page:
+
+
+
+
You can also untick "Don't show this dialog again" if you want to see it again later.
+
Instead of using this dialog, you can always change this information using the Git configuration:
+
+
Click
+ New Entry and enter the key value pairs user.email and user.name
+
+
+
+
+
+
+
+
+
+
Setting up the Home Directory on Windows
+
Add the environment variable HOME to your environment variables.
+
+
In Windows 7, type "environment" at the start menu.
+
Select "Edit environment variables for your account".
+
Under "User Variables", click the "New" button.
+
Enter "HOME" in the name field.
+
Enter "%USERPROFILE%" or some other path in the value field.
+
Click OK, and OK again. You have just added the Home directory on Windows.<br />
+
File > Exit, then restart the application.
+
+
Note that if you use
+ Cygwin, you should already have HOME set. For example, if you installed Cygwin to C:\cygwin and your username is Fred, then Cygwin should have already set HOME to C:\cygwin\home\Fred (or something similar). You can verify this by entering echo %HOME% in the Windows command prompt, or echo $HOME in the Cygwin shell.
+
+
EGit needs this path for looking up the user configuration (.gitconfig). HOME should point to your home directory e.g. C:\Users\Tom.
+ Ensure correct case! E.g. C:\users instead of C:\Users may cause problems!
+
+
If the HOME variable is not defined the home directory will be calculated by concatenating HOMEDRIVE and HOMEPATH.
+
If both HOME and HOMEDRIVE are not defined HOMESHARE will be used.
+
EGit shows a warning if HOME is not defined explicitly. Keep in mind that if you set the HOME environment variable while Eclipse is running, you will still see following warning. You will have to restart Eclipse for it to recognize the HOME value.
+
+
+
+
Pointing out the System wide configuration
+
If you use Git for Windows as a companion to EGit, make sure EGit knows where Git is installed so it can find the "system wide settings", e.g. how core.autocrlf is set. Go to the settings and look under Team>Git>Configuration and then the System Settings tab.
+
If you selected one of the options to use Git from the Command Line Prompt when you installed Git for Windows, then the location of the system
+ wide settings is filled in with a path and everything is fine. If not, use the Browse button to locate where Git is installed, e.g. C:\Program Files(x86)\Git.
+
This advice also applies to users of other Git packagings, e.g. Git under Cygwin or TortoiseGit.
+
Non-Windows users should in theory check this setting, but the system wide settings are usually not used on non-Windows platforms.
+
Create Repository
+
+
Create a new Java project HelloWorld. (In this case, the project was built outside of your Eclipse Workspace.)
+
+
+
+
+
+
Select the project, click
+ File > Team > Share Project.
+
+
Select repository type
+ Git and click
+ Next.
+
+
+
+
+
+
+
To configure the Git repository select the new project HelloWorld.
+
+
+
+
+
+
Click
+ Create Repository to initialize a new Git repository for the HelloWorld project. If your project already resides in the working tree of an existing Git repository the repository is chosen automatically.
+
+
+
+
+
+
+
Click
+ Finish to close the wizard.
+
+
The decorator text "[master]" behind the project shows that this project is tracked in a repository on the
+ master branch and the question mark decorators show that the .classpath and .project and the .settings files are not yet under version control.
+
+
+
+
+
+
Track Changes
+
+
Click
+ Team > Add to Index on the project node. (This menu item is named
+ Add on older versions of Egit.)
+
+
The
+ + decorators show that now the project's files have been added to version control.
+
+
Mark the "bin" folder as "ignored by Git", either by right-clicking on it and selecting
+ Team > Ignore or by creating a file .gitignore in the project folder with the following content:
+
+
+
/bin
+
+
+
This excludes the bin folder from Git's list of tracked files.
+
Add .gitignore to version control (
+ Team > Add):
+
+
+
+
+
+
+
You may have to set your Package Explorer filters in order to see .gitignore displayed in the Package Explorer. To access filters, select the down arrow on the right edge of the Package Explorer tab to display View Menu.
+
+
+
+
+
+
Select
+ Filters... from the View Menu and you will be presented with the Java Element Filters dialog. Unselect the top entry to display files that begin with . (period) such as .gitignore.
+
+
+
+
Click
+ Team > Commit in the project context menu.
+
+
Enter a commit message explaining your change, the first line (followed by an empty line) will become the short log for this commit. By default the author and committer are taken from the .gitconfig file in your home directory.
+
You may click
+ Add Signed-off-by to add a
+ Signed-off-by: tag.
+
+
If you are committing the change of another author you may alter the author field to give the name and email address of the author.
+
Click
+ Commit to commit your first change.
+
+
+
+
+
+
+
Note that the decorators of the committed files have changed as a result of your commit.
+
+
+
+
+
Inspect History
+
+
Click
+ Team > Show in History from the context menu to inspect the history of a resource:
+
+
+
+
+
+
+
Create a new Java class Hello.java and implement it.
+
Add it to version control and commit your change.
+
Improve your implementation and commit the improved class.
+
The resource history should now show 2 commits for this class.
+
+
+
+
+
+
+
+
+
Click the
+ Compare Mode toggle button in the History View.
+
+
Double click src/Hello.java in the Resource list of the History View to open your last committed change in the Compare View.
+
+
+
+
+
+
+
+ Congratulations, you just have mastered your first project using Git !
+
+
+
+
+
GitHub Tutorial
+
+ Note: pushing to a GitHub repository via HTTPS or fetching from a private GitHub repository via HTTPS may ask you for your log-in credentials (username and password). Use a
+
+ personal access token
+ (PAT) as the password. Do
+ not use your normal log-in password for your user account at GitHub!
+
+
You have to create the PAT first via the GitHub web UI. GitHub personal access tokens give you fine-grained control over what the token holder may do. This is done by assigning "scopes" to tokens. See the
+ GitHub documentation for the details.
+
+
Some hints:
+
+
A token without scopes gives only
+ read-only access to public information.
+
+
To get write access and access to private repositories your GitHub account has access to, set the
+ repo scope for the token when you create it.
+
+
+
Create Local Repository
+
+
follow
+ EGit/User Guide/Getting Started to create a new local repository (with your content instead of the demo project).
+
+
+
Create Repository at GitHub
+
+
create a new repository at GitHub:
+
+
+
+
+
On the next screen you can see the URLs you may use to access your fresh new repository:
+
+
click
+ SSH to choose the
+ SSH protocol. It can be used for read and write access.
+
+
click
+ HTTP to choose the
+ HTTP protocol. It can also be used for read and write access.
+
+
click
+ Git Read-Only to choose the anonymous
+ git protocol for cloning. It's the most efficient protocol git supports. Since the
+ git protocol doesn't support authentication it's usually used to provide efficient read-only access to public repositories.
+
+
+
+
+
+
Eclipse SSH Configuration
+
+
Open the Eclipse Preference Dialog (
+ Window > Preferences). Navigate to and expand the Network Connections option and select SSH. Ensure that your SSH2 home is configured correctly (usually this is ~/.ssh) and contains your SSH2 keys:
+
+
+
+
+
+
+
if you don't have SSH keys yet you may generate them on the second tab of this dialog (
+ Key Management). Use a good pass phrase to protect your private key, for more details see
+ "working with key passphrases".
+
Further information about advanced SSH configuration (such as using Putty or another SSH agent with EGit) is available in the
+ EGit FAQ (section SSH).
+
+
Push Upstream
+
+
Click
+ Team > Remote > Push... and copy and paste the SSH URL of your new GitHub repository.
+
+
If you are behind a firewall which doesn't allow SSH traffic, use the GitHub HTTPS URL instead and provide your GitHub user and password instead of using the uploaded public SSH key. To store your credentials into the Eclipse secure store click
+ Store in Secure Store.
+
+
+ Note: many HTTP proxies are configured to block HTTP URLs containing a user name, since disclosing a user name in an HTTP URL is considered a security risk. In that case remove the user name from the HTTP URL and only provide it in the user field. It will be sent as an HTTP header.
+
+
+
+
+
+
+
Click
+ Next and on first connection accept GitHub's host key.
+
+
+
+
Enter your SSH key's passphrase and click
+ OK.
+
+
+
+
On the next wizard page click
+ Add all branches spec to map your local branch names to the same branch names in the destination repository (on a one-to-one basis).
+
+
+
+
+
+
+
Click
+ Next. The push confirmation dialog will show a preview of the changes that will be pushed to the destination repository.
+
+
+
+
+
+
+
Click
+ Finish to confirm that you want to push these changes.
+
+
+
+
The next dialog reports the result of the push operation.
+
+
+
+
+
+
Point your browser at your GitHub repository to see that your new repository content has arrived.
The following 16 developers worked on this release:
+ Antonio Barone,
+ Dariusz Luksza,
+ David Ostrovsky,
+ Florian Signoret,
+ Han-Wen Nienhuys,
+ Ivan Frade,
+ Jonathan Nieder,
+ Kamil Musin,
+ Luca Milanesio,
+ Matthias Sohn,
+ Minh Thai,
+ Nasser Grainawi,
+ Nitzan Gur-Furman,
+ Patrick Hiesel,
+ Ronald Bhuleskar,
+ Thomas Wolf
The revision walk interface and the RevWalk and RevCommit
+ classes are designed to be light-weight. However, when used
+ with any repository of considerable size they may still
+ require a lot of memory. This section provides hints on what
+ you can do to reduce memory when walking the revision graph.
+
Restrict the walked revision graph
+
Try to walk only the amount of the graph you
+ actually need to walk. That is, if you are looking for the commits in
+ refs/heads/master not yet in refs/remotes/origin/master, make sure you
+ markStart() for refs/heads/master and markUninteresting()
+ refs/remotes/origin/master. The RevWalk traversal will only parse the
+ commits necessary for it to answer you, and will try to avoid looking
+ back further in history. That reduces the size of the internal object
+ map, and thus reduces overall memory usage.
+
RevWalk walk = new RevWalk(repository);
+ObjectId from = repository.resolve("refs/heads/master");
+ObjectId to = repository.resolve("refs/remotes/origin/master");
+
There is a setRetainBody(false) method you can use to discard the body
+ of a commit if you don't need the author, committer or message
+ information during the traversal. Examples of when you don't need
+ this data is when you are only using the RevWalk to compute the merge
+ base between branches, or to perform a task you would have used `git
+ rev-list` with its default formatting for.
+
RevWalk walk = new RevWalk(repository);
+walk.setRetainBody(false);
+// ...
+
+
If you do need the body, consider extracting the data you need and
+ then calling dispose() on the RevCommit, assuming you only need the
+ data once and can then discard it. If you need to hang onto the data,
+ you may find that JGit's internal representation uses less overall
+ memory than if you held onto it yourself, especially if you want the
+ full message. This is because JGit uses a byte[] internally to store the
+ message in UTF-8. Java String storage would be bigger using UTF-16,
+ assuming the message is mostly US-ASCII data.
+
RevWalk walk = new RevWalk(repository);
+// more setup
+Set<String> authorEmails = new HashSet<String>();
+
+
for (RevCommit commit : walk) {
+ // extract the commit fields you need, for example:
+ authorEmails.add(commit.getAuthorIdent().getEmailAddress());
+
+
commit.dispose();
+}
+
+
Subclassing RevWalk and RevCommit
+
If you need to attach additional data to a commit, consider
+ subclassing both RevWalk and RevCommit, and using the createCommit()
+ method in RevWalk to consruct an instance of your RevCommit subclass.
+ Put the additional data as fields in your RevCommit subclass, so that
+ you don't need to use an auxiliary HashMap to translate from RevCommit
+ or ObjectId to your additional data fields.
+
public class ReviewedRevision extends RevCommit {
+
A RevWalk cannot shrink its internal object map. If you have just
+ done a huge traversal of say all history of the repository, that will
+ load everything into the object map, and it cannot be released. If
+ you don't need this data in the near future, it may be a good idea to
+ throw away the RevWalk and allocate a new one for your next traversal.
+ That will let the GC reclaim everything and make it available for
+ another use. On the other hand, reusing an existing object map is
+ much faster than building a new one from scratch. So you need to
+ balance the reclaiming of memory against the user's desire to perform
+ fast updates of an existing repository view.
+
RevWalk walk = new RevWalk(repository);
+// ...
+for (RevCommit commit : walk) {
+ // ...
+}
+walk.dispose();
+
While JGit contains a lot of low level code to work with Git repositories, it also contains a higher level API that mimics some of the Git porcelain commands in the
+ org.eclipse.jgit.api package.
+
+
Most users of JGit should start here.
+
AddCommand (git-add)
+
AddCommand allows you to add files to the index and has options available via its setter methods.
+
+
addFilepattern()
+
+
Here's a quick example of how to add a set of files to the index using the porcelain API.
createbranch: true/false/yes/no to indicate whether the branch should be created if it does not already exist (defaults to false)
+
force: true/false/yes/no: if true/yes and the branch with the given name already exists, the start-point of an existing branch will be set to a new start-point; if false, the existing branch will not be changed (defaults to false)
This document is maintained in a collaborative wiki. If you wish to
+ update or modify this document please visit
+
+ https://wiki.eclipse.org/JGit/User_Guide
+
If you're new to Git or distributed version control systems generally, then you might want to read
+ Git for Eclipse Users first. If you need more details and background read the book
+ Pro Git.
+ Find details about each release in the
+ new and noteworthy and the
+ release notes.
+
+
Taking JGit for a Spin
+
Although you are probably interested in JGit because you want to integrate it into an existing application or create a tool, JGit is more than simply a Java library for working with git repository. So before diving into the different aspects of the library let's take JGit for a spin.
+
You are probably familiar with the git command line interface (CLI) that can be used from the shell or in scripts. JGit comes with its own small CLI, which, although not as feature-full as the git CLI, is a good way to showcase what JGIt can do. Furthermore, the programs serve as an excellent source of inspiration for how to accomplish different tasks.
+
Building the JGit CLI
+
Assuming that you have the EGit git repository cloned and ready, build the jgit binary by running the jgit maven build (see
+ the Contributor Guide):
+
+
~/src/jgit$ mvn clean install
+
+
Find the jgit binary here (path relative to root of working tree of your clone of the jgit repository):
+
org.eclipse.jgit.pgm/target/jgit
+
+
Check your build by running the "version" command:
+
prompt$ ./jgit version
+jgit version 0.10.0-SNAPSHOT
+
+
If you want to use jgit frequently you may consider to ease running it via a symbolic link (usually goes under /usr/local/bin)
+
sudo ln -s /path/to/jgit /usr/local/bin/jgit
+
+
Running the JGit CLI
+
Overview
+
When given the
+ -h flag, commands provide a helpful message listing what flags they support.
+
+
prompt$ ./jgit version -h
+jgit version [--help (-h)]
+
+
--help (-h) : display this help text
+
+
Running
+ jgit with no arguments lists the most commonly used commands.
+
The most commonly used commands are:
+ branch List, create, or delete branches
+ clone Clone a repository into a new directory
+ commit Record changes to the repository
+ daemon Export repositories over git://
+ diff Show diffs
+ fetch Update remote refs from another repository
+ init Create an empty git repository
+ log View commit history
+ push Update remote repository from local refs
+ rm Stop tracking a file
+ tag Create a tag
+ version Display the version of jgit
+
+
The commands are modeled after their corresponding command in the git CLI.
+ We will not cover all the commands here, but simply give some examples.
+
+ jgit also provides a number of debug and test commands, to list all the available commands run
+
+
prompt$ ./jgit debug-show-commands
+
+
Inspecting the Repository
+
Before inspecting the most recent commits, you probably want to know which branches the repository contains and what branch is currently checked out. Using the branch commands -v flag, you get a small summary of branches, their revision, and the first line of the revision's commit message.
will show you all commits in the "master" branch, where the author name matches "Matthias" and the commit messages contains the word tycho. More search criteria to filter the commit log, such as committer name, can be given.
+
Graphical History View
+
Finally, to show some of the graphical capabilities of JGit, we will end this small tour by launching the graphical log tool.
+
prompt$ ./jgit glog
+
+
This should give you a window with the revision graph plotted to the left and three columns containing the first line of the message, the author name, and the commit date.
The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is available
+at http://www.eclipse.org/legal/epl-2.0.
+For purposes of the EPL, "Program" will mean the Content.
+
+
If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at http://www.eclipse.org.
+
+
Third Party Content
+
+
The Content includes items that have been sourced from third parties
+as set out below. If you did not receive this Content directly from
+the Eclipse Foundation, the following is provided for informational
+purposes only, and you should look to the Redistributor's license
+for terms and conditions of use.
+
+
FontAwesome 4.5.0
+
+
This plugin includes images created from rasterized glyphs from
+Font Awesome
+4.5.0 at different resolutions. FontAwesome is available under
+the SIL Open Font License.
+
+
+
\ No newline at end of file
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/about.ini" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/about.ini"
index cd4f314c5197f407c802937fae8fc40887b30b00..7c0c9e4b515e3ccee13f1ce347e8b9e59e6a48d1 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/about.ini"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/about.ini"
@@ -1,3 +1,7 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e133246a18a7e761404a73a724b924c8dcf9f124d71d9a7e92c4d9e77d53d405
-size 226
+aboutText=Marketplace Client\n\
+\n\
+Copyright (c) 2010, 2018 The Eclipse Foundation and others. All rights reserved.\n\
+Visit http://www.eclipse.org/mpc
+
+featureImage=icons/marketplace32.png
+aboutImage=icons/marketplace32.png
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-favorites.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-favorites.png"
index a3e061ccbf57dc5bf1d24a5d41ab76ff1a0073c1..ac129655260a48ac3ac0c179bc172abd6018f6d1 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-favorites.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-favorites.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-login.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-login.png"
index f17de8a407a67077e6961746512958fb49658010..e09e80d467bc2dfc4fde4fedd2f8313fe6aa5b19 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-login.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-login.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-update.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-update.png"
index ee3a36411451ec732acdd414bcd5a8052e025161..10e0786c32d214524ceaff4a3c9ae24856e13b9c 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-update.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-update.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-warning.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-warning.png"
index e37216d007df7139f08e477c28ce88b00838350e..2349a2cc2c30fa4abd64963acd25b5703b1555a0 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-warning.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/action-item-warning.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/favorites-list.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/favorites-list.png"
index d59a2852c6190babcc7d8b38328d36e5055e4d2b..14a36241b6ecd624e333eaf489f29d9350fdfa49 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/favorites-list.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/favorites-list.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_disabled_obj.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_disabled_obj.png"
index eab333be3a81e6dcd0cf6a340def66b8f34d59f7..2903413527fdefba413dfa6cdb247ecd27241944 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_disabled_obj.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_disabled_obj.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_disabled_obj@2x.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_disabled_obj@2x.png"
index 8d0ef56c3ed40e10a0fda8fde0edacf335ab3625..fda2009f2f81cf449d05c2e39f3f82a2c7b16f5a 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_disabled_obj@2x.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_disabled_obj@2x.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_install_obj.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_install_obj.png"
index f094347e3bdca01ffd059af4bc780150578a4db6..c6aeae4d462dd0c8f31506fbd5b1657fc51c459b 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_install_obj.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_install_obj.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_install_obj@2x.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_install_obj@2x.png"
index 94eda4b9acb177c97489c93e3bb510e25e00e5ef..a5fbbb07183b3ffe73e4b7b538817f354d6ac296 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_install_obj@2x.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_install_obj@2x.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_obj.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_obj.png"
index 4a143485142f237b33f1c68eaf089ab0b6a672d3..684e82a8c86c7fa72b90e14afb1b67c8310a2316 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_obj.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_obj.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_obj@2x.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_obj@2x.png"
index da382eb8d1f2c652172f42264d09a04cadad7cb7..d61d826240822cdbee0de696d052c72e68b2f99b 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_obj@2x.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_obj@2x.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_uninstall_obj.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_uninstall_obj.png"
index 6832e8d0a2a775ede3b0d0c3dd24cc0dc0910563..bcfae2003d48d878678acce240f18b8db471568e 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_uninstall_obj.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_uninstall_obj.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_uninstall_obj@2x.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_uninstall_obj@2x.png"
index 0f3620a8bb5cb3cec7c6db57209b801ae5dc39f1..02a36f151429ca88301cf6b94ee9b47133d7c9fe 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_uninstall_obj@2x.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_uninstall_obj@2x.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_update_obj.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_update_obj.png"
index 84797e50fc35dad194ba52552dd9ca6f76af267b..a85100479e8779f0fd0b97a0ea93373c4f17dc74 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_update_obj.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_update_obj.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_update_obj@2x.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_update_obj@2x.png"
index 2cd8b1c8837e39e38f1390290e885806d63c0b8a..f0c1fded4c7d95d6f066e97a96ba5c57b81853b3 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_update_obj@2x.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/iu_update_obj@2x.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace16.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace16.png"
index 2aaafd56bf050cd39e2ab09e8468223fc9c633a2..368065b04cbf3c8805c4fc1bb0ccbcf56dc869ef 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace16.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace16.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace16@2x.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace16@2x.png"
index 41f3bf1d84847078dfc56376321c995b21cd8f6a..d7aeff9a333a7eabeee97438901de1d6994e5102 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace16@2x.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace16@2x.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace32.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace32.png"
index 98d60240396bdf99b8305e7c32328fa963861d5a..93d77e786bbe4359f7a65f4432d56b5c30072db0 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace32.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace32.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace32@2x.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace32@2x.png"
index e23bd2e8cd63e51c069703d0137f103bcc937aed..8db22ad44ad0a6ff088cd35cdd7179656308ce0e 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace32@2x.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace32@2x.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace_banner.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace_banner.png"
index 65ef82ed3abd9c78547cf825c2d1decdc752be50..5d6eab962be341287b049891e7bd97d0bd2b587c 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace_banner.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/marketplace_banner.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/news_update.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/news_update.png"
index ec028a9ee3bb9fc0d723692748c7fba58eba650c..6142a8c60842070b6bf5b6d6e764ef9a1fce9a75 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/news_update.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/news_update.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/news_update@2x.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/news_update@2x.png"
index 95d94f586456b75aa9b54117d91c687ca1bd4b28..f939a4dd778f97c8f93fc40b3b38003e24b9949f 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/news_update@2x.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/news_update@2x.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/noiconprovided.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/noiconprovided.png"
index f84cae58f932e0cb6a1db49f63983f0bda7aeab5..de6836bb5cd2f746197b06eb28deff86ce081f31 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/noiconprovided.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/noiconprovided.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/noiconprovided32.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/noiconprovided32.png"
index 986777c722305766c109baeb902705516fdc9cd1..0a76fd0dd340cd690328f7a09e9533b069053d6d 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/noiconprovided32.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/noiconprovided32.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/share.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/share.png"
index f570e0af72eb21cc63fd1639be2ff39a7c10ae51..53cd8e658e3011022f7f90620cbca7fa8f255213 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/share.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/share.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/star-selected.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/star-selected.png"
index 8c1318a6c7ddc536481b5bef9383c8aa45f1e67c..e1aff2432d604e6a6e9869a10ea748743b8ae60b 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/star-selected.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/star-selected.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/star.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/star.png"
index a286adcbd4d3312eb6f2f506c0bf7dd5fcc0c75d..b2669435fcfc637f17c9676cef39cc860c6e0d4c 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/star.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/icons/star.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/default.css" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/default.css"
index 8be0bf97bf6260d1708a9738b91bc332aacfb5ac..c0eb706db02f8dd3c582dd5f76aabf1d04428b61 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/default.css"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/default.css"
@@ -1,3 +1,3 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5450746d183e9a9f6b68fcf655d062c9542e4ac21f919c90fff4a29f4038d1fb
-size 169
+
+a#orgeclipseeppmpcui-introLink img { background-image : url(marketplace.png); }
+a#orgeclipseeppmpcui-introLink:hover img { background-image : url(marketplace.png); }
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/marketplace.png" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/marketplace.png"
index beaed23997e870a4404dbf762df8c39c14f3476b..434a3b39bd365305c13e2629641829e4b9293bbb 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/marketplace.png" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/marketplace.png" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/overview.properties" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/overview.properties"
index 87539675ad216ce9fa16e65fa9392e7ce04253fe..b3b0efb1ecd6c204aca898482fe4f370c89b5be8 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/overview.properties"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/css/overview.properties"
@@ -1,3 +1,2 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:508969b945757e71962fa86ae83c07767d5692baf3bacae86cb42a072a26425e
-size 148
+overview.orgeclipseeppmpcui-introLink.link-icon=intro/css/marketplace.png
+overview.orgeclipseeppmpcui-introLink.hover-icon=intro/css/marketplace.png
\ No newline at end of file
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/default.xml" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/default.xml"
index 249c580a087240afbd83d239f5e240cb9b56acb8..6d90dbf176e7b12a5f68bb7c9cb2dfcd5888934c 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/default.xml"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/intro/default.xml"
@@ -1,3 +1,26 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3b541c4c5071b2bd163d933e8fc3f684182f8efa020038351a6b345e04839533
-size 1139
+
+
+
+
+
+
+ Install Eclipse extensions and solutions
+
+
+
+
\ No newline at end of file
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/CatalogExtensionPointReader.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/CatalogExtensionPointReader.class"
index 9072a01c6a1b8ebb7fd99f0d3114a78c41ed7b92..39f51f375285372d48bd793c77f6bb46ee2bfd43 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/CatalogExtensionPointReader.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/CatalogExtensionPointReader.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/CatalogRegistry.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/CatalogRegistry.class"
index 918864f4640c093cdfe30e2f7e5c598190f0c8c5..e77cf427125c4fc70e8ec449bacdc3bdb5349d71 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/CatalogRegistry.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/CatalogRegistry.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientDebug$DebugOptionsInitializer.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientDebug$DebugOptionsInitializer.class"
index 7399bc19c23eda9cbc4386eac4ac3800e8be2f34..0fc5509251611fd8df16aa7aca6f988733e3c6be 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientDebug$DebugOptionsInitializer.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientDebug$DebugOptionsInitializer.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientDebug.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientDebug.class"
index 88d692584c65ad38107875608cbee06da9f74f7d..ec00efac593d8dc3612fc66425a8b7e83555fccb 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientDebug.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientDebug.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUi.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUi.class"
index 44045486e6087b211021cec7cd46ad190f89f690..3b2648c75a5af99300eb8723ca19ade9e5f05fcf 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUi.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUi.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUiResources$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUiResources$1.class"
index 0cc05b24cffc27286198e551e9d26e79cab5a6e0..554b1edcb3fbb93a42dd0e9cb666f752a307139f 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUiResources$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUiResources$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUiResources.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUiResources.class"
index fdd3919661c51209127c9e42c3658bc2db063abd..2c4ba79160d01a99e79fe6d6be66147f6e5e31e1 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUiResources.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/MarketplaceClientUiResources.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/Messages.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/Messages.class"
index 5cfa2bbd3f58165d03ee2bbc63e97de5911d3a08..1ac1aeebb04b7051e4d05699740e435b7de0046f 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/Messages.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/Messages.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/Messages.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/Messages.class"
index 97601e67713b7fb32191c9ad717152ed57e6bcd1..8275e6cc22015c12767e2af93ff66d7c444287cf 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/Messages.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/Messages.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/WelcomeIntroAction.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/WelcomeIntroAction.class"
index 4e3dfdb621cc776e974a9ab8c33cb7778dacc7eb..0e99cca24ebd31aa81c5213ae51379790581f595 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/WelcomeIntroAction.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/WelcomeIntroAction.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/messages.properties" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/messages.properties"
index b28c05fb401b1dae6fce4b0166f1bb348e71919f..fee5a80645fe39a1505201226e2cd04c02a4cea6 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/messages.properties"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/actions/messages.properties"
@@ -1,3 +1,13 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64fac1de251a77d5629eb408675f162a9c956504934f3642ea78a87b93feb58a
-size 642
+###############################################################################
+# Copyright (c) 2010, 2018 The Eclipse Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# The Eclipse Foundation - initial API and implementation
+###############################################################################
+WelcomeIntroAction_cannotOpenWizard=Cannot open marketplace wizard
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoriteListCatalogItem.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoriteListCatalogItem.class"
index 87f07d4235122bcb80cb331d275f402963dc67dc..4567c421e8e1f368c8ba2256b9e5b33f5f158756 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoriteListCatalogItem.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoriteListCatalogItem.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoritesCatalog.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoritesCatalog.class"
index 177f4e59f32122e7d58555e2474d23aab5291fed..686360159d570277dc845e4d3d52c833c30c56bd 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoritesCatalog.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoritesCatalog.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoritesDiscoveryStrategy.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoritesDiscoveryStrategy.class"
index 10c13db6146c09aeb1997109e2820b54cefb855b..a98c82c5be6a5f6b541c8ebbed1b3e4828416a1a 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoritesDiscoveryStrategy.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/FavoritesDiscoveryStrategy.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog$1.class"
index b934fee9bb54b8399b0499a7a6e0d57f0ad82916..6c5715df409226599a696aca1d16a881c32ac683 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog$DiscoveryOperation.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog$DiscoveryOperation.class"
index 9dbe9decb14f2179f888b10df140a5afe9bf6e71..d0b2cd281a8e321e511179a99eda739bdb38ca48 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog$DiscoveryOperation.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog$DiscoveryOperation.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog.class"
index e8499709dde4e0a3a260cd0a154e03c6454f731d..d5f22ecb41fd79633e0bbbe2308e3ee3c1b24f96 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalog.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalogSource.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalogSource.class"
index bdee83d4d3f95cd237c7dab67bd02343a5bea02a..7ee24e1486f930d387fea28c34534edd2644bbc5 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalogSource.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCatalogSource.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCategory$Contents.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCategory$Contents.class"
index e42411904abb45e554a4858bdecf862ba4cb4f66..aca5089ab092d18afa2160f060376fac0f1fe960 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCategory$Contents.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCategory$Contents.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCategory.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCategory.class"
index c63ade299ae4fda75d486c2116fe0af6fd7253dc..6a2c525a35a2617fe5441f2a2a4e9912dd684a63 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCategory.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceCategory.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy$1.class"
index 289f3354bc9db89d408c2111d8bf049936a0fec5..097b55c5d18980d2475caf1286510d336199ef7d 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy$2.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy$2.class"
index 296eb334e0ac282680167a87e2edf671456f70b5..44d275daac4bc7b07617e03d707595b51c93a9b9 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy$2.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy$2.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy.class"
index 38abe3eafebbad8e6badb12178f2a0cc3ea7d7b9..25ff9f17c3d938db2361ac511c0680e0481965ad 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceDiscoveryStrategy.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceInfo$RegistryFile.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceInfo$RegistryFile.class"
index 8cd29208c99ede696225290cba4667646a6a752f..da5114fe6f6d94dd1d22a4e3573476818f4ae1fe 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceInfo$RegistryFile.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceInfo$RegistryFile.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceInfo.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceInfo.class"
index 2bcf8ccd47669ac4bf3c4b782ee752cd6d700fc0..4b1f7c66e3aeed1df7a0cea1b6a6382d723494a4 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceInfo.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceInfo.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeCatalogItem.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeCatalogItem.class"
index dd173cc20f08a30f4e5f97a189a5a027a500c453..07ae3561e927c9cf69a56d534f0afa5fccc988e4 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeCatalogItem.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeCatalogItem.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeInstallableUnitItem.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeInstallableUnitItem.class"
index e10aa7eee83e6b6df7277c320d4c67a089a12482..e7b3e338c1047529a653218c354eb2caf8b222f1 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeInstallableUnitItem.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeInstallableUnitItem.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/Messages.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/Messages.class"
index 5055783ea0e674985ee65fc1b0f8952d4d542613..b4c7ed9cef56cf6d69c8ecaed316d90cc4ece883 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/Messages.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/Messages.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$1.class"
index 7aa351d300455cb4c8ee5c1653185bdec8dba5b1..18bf395609d942c00b7c01963666aa108b6d4a06 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$2.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$2.class"
index 4a3fd4133ef65d3dd22cdc70eb7e9df97dbcfc1c..c58120c1ee47b1d59925d4c027e474b532e7a4ee 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$2.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$2.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$ResourceFuture.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$ResourceFuture.class"
index 331a5b6ff2a85c9e764fd2ae0bfc748c4dbbabce..b2fcbbbcc8eebfc780cb7ae9a711a7c1e5adb533 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$ResourceFuture.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$ResourceFuture.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$ResourceReceiver.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$ResourceReceiver.class"
index 07da6026fac1fbf338204fc9ffe9e84b5fb872a5..b666dfd0d6fbbe03b9d975b429baee3b8abd693e 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$ResourceReceiver.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider$ResourceReceiver.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider.class"
index c888f435dc4c40738c238bbfe9e665a2fd9fc35c..36c461268c31e5f81c3f9987cb1503e78d9fa7cf 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProvider.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProviderImageDescriptor.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProviderImageDescriptor.class"
index d533f0028e03aab11d48a05daf4cbb452578036d..9222dee482a19643ca0b73b376822747f4b613ee 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProviderImageDescriptor.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/ResourceProviderImageDescriptor.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/UserActionCatalogItem$UserAction.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/UserActionCatalogItem$UserAction.class"
index 758246ab59ee3fc77498222d2f6c0222922b6ce9..dad61096cdf34c1b96ee009577b561f01c270981 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/UserActionCatalogItem$UserAction.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/UserActionCatalogItem$UserAction.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/UserActionCatalogItem.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/UserActionCatalogItem.class"
index 80d8669ba54e5c0b2ec3501b2b1191bca81f98d1..1fcefd8d9b4bd31be6f921132c786ab0dfef5540 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/UserActionCatalogItem.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/UserActionCatalogItem.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/messages.properties" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/messages.properties"
index 03bfb394841222e056184f4cf6356230d6802728..b5ac97c34956e67fe37c4c950285e3be2edfa9f1 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/messages.properties"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/catalog/messages.properties"
@@ -1,3 +1,58 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:88352c38f869c3c765399e5a648fe5d07c2a38da810878ab3dc03bd5ce9de627
-size 4172
+FavoriteListCatalogItem_defaultListName=Favorites for {0}
+FavoritesDiscoveryStrategy_noFavoritesMessage=I'm sorry, this favorites list appears to be empty.
+FavoritesDiscoveryStrategy_noFavoritesTitle=Empty favorites list
+###############################################################################
+# Copyright (c) 2010, 2018 The Eclipse Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# The Eclipse Foundation - initial API and implementation
+###############################################################################
+FavoritesDiscoveryStrategy_enterFavoritesUrlMessage=Please enter the URL to a Favorites list you wish to import. Or browse the Marketplace for more lists and drop one here.
+FavoritesDiscoveryStrategy_enterFavoritesUrlTitle=Check out other users' favorites
+FavoritesDiscoveryStrategy_favoritesCategoryTitle=Explore Favorite Lists
+FavoritesDiscoveryStrategy_invalidUrl=Invalid favorites URL: {0} - {1}
+MarketplaceCatalog_addedNullEntry={0} added a null item
+MarketplaceCatalog_Checking_News=Checking news
+MarketplaceCatalog_checkingForUpdates=Checking for updates
+MarketplaceCatalog_Discovery_Error=Updating Marketplace catalog encountered problems
+MarketplaceCatalog_ErrorReadingRepository=Skipping update check for repository ''{0}'' - failed to read repository. Affected entries:
+MarketplaceCatalog_failedWithError={0} failed with an error
+MarketplaceCatalog_InvalidRepositoryUrl=Skipping update check for ''{0}'': Invalid repository url {1}
+MarketplaceCatalog_queryFailed=Query failed to complete
+MarketplaceCatalog_queryingMarketplace=Querying marketplace
+MarketplaceCatalog_UpdateCheckDiscoveryError=Failed to perform update check for some installed items
+MarketplaceDiscoveryStrategy_badUri=Bad URI for entry ''{0}'' ({1}): {2}
+MarketplaceDiscoveryStrategy_catalogCategory=Catalog category
+MarketplaceDiscoveryStrategy_ComputingInstalled=Finding installed solutions
+MarketplaceDiscoveryStrategy_downloadError=Failed to download image for entry ''{0}'' ({1}) from {2}
+MarketplaceDiscoveryStrategy_failedToSaveMarketplaceInfo=Unable to save local Marketplace data
+MarketplaceDiscoveryStrategy_FavoritesRefreshing=Refreshing favorite status
+MarketplaceDiscoveryStrategy_FavoritesRetrieve=Getting user favorites
+MarketplaceDiscoveryStrategy_FavoritesRetrieveError=Failed to get user favorite information
+MarketplaceDiscoveryStrategy_findingInstalled=Finding Installed
+MarketplaceDiscoveryStrategy_invalidFilter=Invalid filter selection
+MarketplaceDiscoveryStrategy_loadingMarketplace=Loading marketplace
+MarketplaceDiscoveryStrategy_loadingResources=Loading resources
+MarketplaceDiscoveryStrategy_Name_and_Version={0} {1}
+MarketplaceDiscoveryStrategy_noNameMatch=No known item found for name '{0}'
+MarketplaceDiscoveryStrategy_noUrlMatch=No known item found for url '{0}'
+MarketplaceDiscoveryStrategy_ParseError=Error parsing search result entry {0}
+MarketplaceDiscoveryStrategy_requestSource=entry ''{0}'' ({1})
+MarketplaceDiscoveryStrategy_saveMarketplaceInfoJobName=Saving local Marketplace data
+MarketplaceDiscoveryStrategy_searchingMarketplace=Searching Marketplace
+MarketplaceDiscoveryStrategy_sendingErrorNotification=Sending Marketplace error notification
+MarketplaceDiscoveryStrategy_unidentifiableItem=Unidentifiable item {0}: At least one of id, url or name must be set.
+MarketplaceDiscoveryStrategy_unknownFilter=Unknown filter selection
+MarketplaceInfo_LoadError=Error restoring marketplace info cache file
+MarketplaceNodeCatalogItem_changeSupportAccessError=Error accessing change support
+MarketplaceNodeCatalogItem_changeSupportError=Error initializing change support
+ResourceProvider_downloadError=Failed to download resource for {0} from {1}
+ResourceProvider_FailedCreatingTempDir=Unable to create temporary resource folder {0}
+ResourceProvider_retrievingResource=Retrieving catalog resource
+ResourceProvider_waitingForDownload=Waiting for catalog resource
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/AbstractMarketplaceWizardCommand.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/AbstractMarketplaceWizardCommand.class"
index 9fd859c2d527c19000547b30ef6bfffb6271fc06..3d372c0efbbb1ccf896b7fa7280cce6c35ea4cbe 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/AbstractMarketplaceWizardCommand.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/AbstractMarketplaceWizardCommand.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ImportFavoritesWizardCommand$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ImportFavoritesWizardCommand$1.class"
index fa86d69cfd077734b2ba69e94a044ead46cf8a67..5c7800260b43ff6e6ea37f5bed0f03c900eeb49e 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ImportFavoritesWizardCommand$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ImportFavoritesWizardCommand$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ImportFavoritesWizardCommand.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ImportFavoritesWizardCommand.class"
index 3839ebf428dec1942630d1cf7b6c13eb02543cc9..83f1db880dbe8c62bf7a891f284869e41d11f571 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ImportFavoritesWizardCommand.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ImportFavoritesWizardCommand.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand$1.class"
index 162d41acd7d9c8c613866f664615568189f445c6..83011d0225bd15e5cf1a9efe9f2e6dabb27fafc9 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand$2.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand$2.class"
index 502c28f7ee21aa5657a9d4b943a347e91389fd49..18b9879704d04452d3d42a66dc54d6dc52b4a2c9 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand$2.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand$2.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand.class"
index 994c070c2a1edba5e87a0edec7f3450147447f5d..7574a9206f6429503818df4220884de22ff8f0cc 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/MarketplaceWizardCommand.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/Messages.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/Messages.class"
index 2e2cd55a3ad595a9621a55b9293d039a05350d2b..2a8dcf3a66eef8c0ae8f925b14e7d0be7a740dbb 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/Messages.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/Messages.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ShowFavoritesCommand.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ShowFavoritesCommand.class"
index 34d790a779b993f8a69a8311fac20a17064066a9..3e394d9fa7ea428916b0fe391e9b496dd90e84e8 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ShowFavoritesCommand.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ShowFavoritesCommand.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ShowInstalledSolutionsCommand.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ShowInstalledSolutionsCommand.class"
index 8921bd2cdf91db68b26cf10f6d874a77e7229e72..2a5ffcd4a01a5f793cab12a930ec928f2179d5c2 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ShowInstalledSolutionsCommand.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/ShowInstalledSolutionsCommand.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/messages.properties" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/messages.properties"
index 41a32baf83db41fb8377537efa957dee11c8a444..b3f71a62069392899a96935ebbfbb04fc24b0522 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/messages.properties"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/commands/messages.properties"
@@ -1,3 +1,22 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cf223c7da3c397c76137262fda37ed920b76a773a9033236f6f9ca79d9aee1c
-size 1363
+###############################################################################
+# Copyright (c) 2010, 2018 The Eclipse Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# The Eclipse Foundation - initial API and implementation
+###############################################################################
+MarketplaceWizardCommand_allCategories=All Categories
+MarketplaceWizardCommand_allMarkets=All Markets
+MarketplaceWizardCommand_CannotInstallRemoteLocations=Cannot install remote marketplace locations
+MarketplaceWizardCommand_cannotOpenMarketplace=Cannot open Eclipse Marketplace
+MarketplaceWizardCommand_CouldNotFindMarketplaceForSolution=Could not find marketplace for this solution
+MarketplaceWizardCommand_eclipseMarketplace=Eclipse Marketplace
+MarketplaceWizardCommand_FailedRetrievingCatalogImage=Failed to retrieve catalog image for {0} from {1}
+MarketplaceWizardCommand_FailedRetrievingCatalogWizardIcon=Failed to retrieve wizard icon for {0} from {1}
+MarketplaceWizardCommand_noRemoteCatalogs=No remote catalogs found
+MarketplaceWizardCommand_requestCatalog=catalog ''{0}'' ({1})
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/AskMarketplaceForFileSupportStrategy.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/AskMarketplaceForFileSupportStrategy.class"
index 111434aa3c6e58206cd35025c5c253af09d235e9..dae03e40953ff4be494817b7130ddf0c309ad674 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/AskMarketplaceForFileSupportStrategy.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/AskMarketplaceForFileSupportStrategy.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/CollectMissingNaturesVisitor.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/CollectMissingNaturesVisitor.class"
index f29e923b91841645ca979f1222b236b9bf9c5c51..39f2dd5e5579fed94e4d71e786d9ef2adb3c262a 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/CollectMissingNaturesVisitor.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/CollectMissingNaturesVisitor.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverFileSupportJob.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverFileSupportJob.class"
index 915ef7a2f90ab60578775ad6ed165a6d47ce1756..05f97429fac24739f89fb6aa8915f48bcd498d7d 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverFileSupportJob.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverFileSupportJob.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverNatureSupportJob.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverNatureSupportJob.class"
index a162410bf25ca4396584ee0c5bcd97cdcdae9cbe..91376118295121992ccb0c4bbeb2667ee074af2d 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverNatureSupportJob.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/DiscoverNatureSupportJob.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/MissingNatureDetector$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/MissingNatureDetector$1.class"
index 7ed9dda7b18fa7dfc13d30db184a1b591099967c..3f04a3f4b88ad0fd2d37d0b300f92e27613ae18c 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/MissingNatureDetector$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/MissingNatureDetector$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/MissingNatureDetector.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/MissingNatureDetector.class"
index f1aeea75ec4cd004784fe48e349db7193528def1..a8947303666ecbb251ba8c67c7a6d3614619ba01 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/MissingNatureDetector.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/MissingNatureDetector.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$1.class"
index a6d61675b3505aa175b0c78e9ce2d0e9321bab26..7909827ea96ac5989774ccaf621b9a135668ee35 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$2.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$2.class"
index a97f6d260f4a9bf8c459e0e631ebf8cff31ae360..3081a7de4164ba48e84b5676dcc108e46ff2e232 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$2.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$2.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$3.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$3.class"
index 9812b9c57c554bad5ec06ea0cd0e97ad2769ebe1..1c6dd0bcce8ce5e54744ceba2149572bfe903899 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$3.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog$3.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog.class"
index ba2765447b39fd4412dc0596c19c838e3c6b138a..1ff07bfd8563ad16348dd18674cda033355b8fb9 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsDialog.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsJob.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsJob.class"
index 705e8a54aaaff390a83ebe04044d491cadefa3d0..adb1580da47c8e46dfe23f64660e985eed264bb1 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsJob.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowFileSupportProposalsJob.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsDialog$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsDialog$1.class"
index 051296bf57a1529f58cdcee66b1ec93264e8096c..dcd34687bd214bafdac870d692d8a65cc5210ef3 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsDialog$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsDialog$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsDialog.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsDialog.class"
index 0457df0599db607c967976c1bdf403a6268a228d..4f552fac86075278c277908ff72b8c5871880a61 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsDialog.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsDialog.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsJob.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsJob.class"
index 598ede3541f8842c16d80ae597a5ee0ac0e67668..3e34438063ec76a4c759982c96647d99b4b7611c 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsJob.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/discovery/ShowNatureProposalsJob.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/messages.properties" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/messages.properties"
index 4f3d5d5f861123dc8074f4697d4bc65719a72255..23ebfbf4010f458c24583761f06407b12c781627 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/messages.properties"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/messages.properties"
@@ -1,3 +1,43 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7315eebfba6e5bdb749bd6fb528f258fe440651434ccf848574c62b71a42020b
-size 3572
+###############################################################################
+# Copyright (c) 2010-2017 The Eclipse Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# The Eclipse Foundation - initial API and implementation
+###############################################################################
+ProjectNatures=Project Natures
+CatalogExtensionPointReader_cannotFindResource=Cannot find resource {0}
+CatalogExtensionPointReader_cannotRegisterCatalog_bundle_reason=Cannot register catalog for bundle {0}: {1}
+CatalogExtensionPointReader_labelRequired=Must specify label
+CatalogExtensionPointReader_urlRequired=Must specify url
+MarketplaceClientUi_message_message2={0}: {1}
+MarketplaceClientUi_unexpectedException_reason=Unexpected exception: {0}
+MarketplaceClientUi_notFound=Resource not found: {0}
+MarketplaceClientUi_unknownHost=Cannot resolve host\n\nThis is most often caused by a problem with your internet connection. Please check your internet connection and retry.
+MarketplaceClientUi_connectionProblem=Connection failed\n\nThis is most often caused by a problem with your internet connection. Please check your internet connection and retry.
+MarketplaceOrAssociateDialog_title=Editors available on the Marketplace
+MarketplaceOrAssociateDialog_linkToPreferences=See also Preferences for File Associations
+MarketplaceOrAssociateDialog_message=Better editor support for ''{0}'' files is available on the Marketplace.
+MarketplaceOrAssociateDialog_showProposals=Show IDE extensions for this file type and let me install them
+MarketplaceOrAssociateDialog_associate=Associate ''{0}'' files with current editor ({1}) and do not ask again
+MarketplaceOrAssociateDialog_descriptionEmbeddedSystemEditor=Your ''{0}'' file was opened in an embedded system editor, which might not be fully integrated. Better editor support is available on the Marketplace.
+MarketplaceOrAssociateDialog_descriptionExternalSystemEditor=Your ''{0}'' file was opened in an external system editor. Better editor support is available on the Marketplace.
+MarketplaceOrAssociateDialog_descriptionSimpleTextEditor=Your ''{0}'' file was opened in a simple text editor. Better editor support is available on the Marketplace.
+AskMarketPlaceForFileSupportStrategy_jobName=Search Marketplace for compatible editors ({0})
+AskMerketplaceForFileSupportStrategy_dialogJobName=Proposals dialog
+DiscoverFileSupportJob_discoveryFailed=File support discovery for {0} failed
+LookupByNatureJob_discoveryFailed=Project nature discovery for {0} failed
+MissingNatureDetector_Title=Marketplace solutions available
+MissingNatureDetector_Desc=Some helpful solutions are available on the Marketplace
+MissingNatureDetector_Message=Your IDE is missing natures to properly support your projects.\n\
+Some extensions on the Eclipse Marketplace can be installed to support those natures.
+MissingNatureDetector_jobName=Search Marketplace for Project Nature support ({0})
+MissingNatureDetector_ShowSolutions=Show Solutions
+MissingNatureDetector_enable=Automatically detect missing natures and propose IDE extensions from Marketplace
+PreferencePage_linkToEditorSettings=Use the File Associations page to configure editor discovery for unassociated file types.
+MissingNatureDetector_linkToPreferences=See also Project Natures preferences
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/AbstractProvisioningOperation.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/AbstractProvisioningOperation.class"
index 6f1e9117e8614ec7aa5875a63a35d43ef428360c..b54f62ada3b6994f5dcf6cc7cf20efbc89f2a4a6 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/AbstractProvisioningOperation.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/AbstractProvisioningOperation.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/CompositeProfileChangeOperation.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/CompositeProfileChangeOperation.class"
index ee0a354ccdf3c4bce79586116888e8599a0efbc7..1bf874dc90ed7db93f810b6022fc81e4082e2e35 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/CompositeProfileChangeOperation.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/CompositeProfileChangeOperation.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/FeatureDescriptor.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/FeatureDescriptor.class"
index 90d541ff5e8b3312cf4458910b1020adba72a908..14c205b1f75a3a2399afe3fa8b3ecfbd257b99c6 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/FeatureDescriptor.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/FeatureDescriptor.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/Messages.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/Messages.class"
index 676d4aead693f1b8db7bb0c61160af5f452554c6..9b0dce7d1e6f8dfe081044a14a060dea93a86d28 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/Messages.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/Messages.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$OperationType.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$OperationType.class"
index 80f1dca99408fdbb82b99174c222f9fa5780ee87..3522cecaaf0b9ca4026ff84fd1be37cb7a57f291 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$OperationType.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$OperationType.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$ProfileChangeOperationFactory.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$ProfileChangeOperationFactory.class"
index 6e6a9a7f89c912351f9c6796cf05439ec3675a07..4b94c68a7703e22ab04c60836d7691ed7ea37b2d 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$ProfileChangeOperationFactory.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$ProfileChangeOperationFactory.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$ResolutionStrategy.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$ResolutionStrategy.class"
index e35c8b88470bcf592c8e1f2e30909787fbcc47b0..431450a1bc852511f0d8e84fb0d708f80525bc0b 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$ResolutionStrategy.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer$ResolutionStrategy.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer.class"
index 4500073826f92aff43b0c0710a737b2b9f70552b..6adbacfe9bbd93e992a53d1696b0133c9e2ca390 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ProfileChangeOperationComputer.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper$CleanupAction.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper$CleanupAction.class"
index c4a12b5d084285c0816ac3eb2701647a7e812017..c71d58cd25c0cd44bf6383babaabd8af7355dc51 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper$CleanupAction.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper$CleanupAction.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper$RepositoryTracker.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper$RepositoryTracker.class"
index 3a28b8fb77f53fffb76a4cbcb183fe534e089fa2..a50dd0d884c6ee30a2da41357fd7cdfa8247c441 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper$RepositoryTracker.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper$RepositoryTracker.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper.class"
index 3ba4ddd1c98aa119b214b0f82b31b90106c2cb2d..8f1fb53eb029414fc23f03372eb6accaa60c1aae 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/RepositoryTransactionHelper.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ResolveFeatureNamesOperation.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ResolveFeatureNamesOperation.class"
index 5c8a07c4cf0a742e7394f307da2026a78df1bead..f3c3ebd2d88fdaf1ac5cd4164b3582e28c43b0d3 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ResolveFeatureNamesOperation.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/ResolveFeatureNamesOperation.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/messages.properties" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/messages.properties"
index eb34c6cf84b883003a1f069055849577983c0039..aa4bfe8313efaebb4ac2ba923bf2fcdcf315454a 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/messages.properties"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/operations/messages.properties"
@@ -1,3 +1,23 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:442fb359a61ade850b8ee56e7882606e7688e1cfa5cbc21368285ec3dc1bde53
-size 1439
+###############################################################################
+# Copyright (c) 2010, 2018 The Eclipse Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# The Eclipse Foundation - initial API and implementation
+###############################################################################
+CompositeProfileChangeOperation_ChangeRequestError=Error processing change request
+ProfileChangeOperationComputer_unknownOperation=Unknown operation: {0}
+ProvisioningOperation_commaSeparator=,
+ProvisioningOperation_configuringProvisioningOperation=Configuring provisioning operation
+ProvisioningOperation_nothingToUpdate=There is nothing to update.
+ProvisioningOperation_proceedQuestion=Proceed With Installation?
+ProvisioningOperation_unavailableSolutions=The following solutions are not available: {0}
+ProvisioningOperation_unavailableSolutions_proceedQuestion=The following solutions are not available: {0}\nProceed with the installation anyways?
+ProvisioningOperation_unavailableFeatures={0} (id={1}, site={2})
+ProvisioningOperation_unexpectedErrorUrl=Unexpected error handling repository URL
+ResolveFeatureNamesOperation_resolvingFeatures=Resolving features
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/preferences/MPCPreferenceInitializer.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/preferences/MPCPreferenceInitializer.class"
index 26768d7539b77d031de01efed89d111f0c7ad483..8685f7f3d404d7793fa45d6533588cd06a6520b4 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/preferences/MPCPreferenceInitializer.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/preferences/MPCPreferenceInitializer.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/preferences/ProjectNaturesPreferencePage.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/preferences/ProjectNaturesPreferencePage.class"
index 6d26fb91a7fb0cc5e98a138a0c0e759f66792fa1..92577400be4a7530dca60463538bebfcf94cd43f 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/preferences/ProjectNaturesPreferencePage.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/preferences/ProjectNaturesPreferencePage.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/AbstractMpcProtocolUrlHandler.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/AbstractMpcProtocolUrlHandler.class"
index a46196190e6d02585fc4d42330b4b046647f5168..67fddc4cbb216d1963ef66bcd7a31c6ad88b3ba5 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/AbstractMpcProtocolUrlHandler.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/AbstractMpcProtocolUrlHandler.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/FavoritesUrlHandler$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/FavoritesUrlHandler$1.class"
index cd105c4cf0c1f9502d5236b36b31c839c80953aa..c1b3d41e40b958d038a6fb23e16817f47a751cd5 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/FavoritesUrlHandler$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/FavoritesUrlHandler$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/FavoritesUrlHandler.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/FavoritesUrlHandler.class"
index 66afd9e57b842d33247e15ffafd089688fab4017..05b18bf175213e68a76755813c9063ccf3203df3 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/FavoritesUrlHandler.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/FavoritesUrlHandler.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/HttpFavoritesUrlHandler.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/HttpFavoritesUrlHandler.class"
index 61d425bd3eaf2a51979306833a5c713d03bfeb43..fbc4e0997f8b98e88977caf55ede05e3cbdfffcf 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/HttpFavoritesUrlHandler.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/HttpFavoritesUrlHandler.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/HttpSolutionUrlHandler.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/HttpSolutionUrlHandler.class"
index 6387fbcc4ee507b283da13f7b16129ab8093e859..e928d706ac38939e798692d41a111999559f4a9d 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/HttpSolutionUrlHandler.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/HttpSolutionUrlHandler.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUriSchemeHandler$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUriSchemeHandler$1.class"
index dbbfc72b5e57063d17c1fb84d63d0a9cfb480563..105a621a53d2a298fcb6a7dc22f15611440e6079 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUriSchemeHandler$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUriSchemeHandler$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUriSchemeHandler.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUriSchemeHandler.class"
index 49a6ff4a1b52903a0301d21c3f0ca9a2b70838fe..61134f5bb7556f3015e887dcbe08e63716ac640d 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUriSchemeHandler.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUriSchemeHandler.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUrlUtil.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUrlUtil.class"
index 2257cfdad9125b91c120440a970d0376a4a302f9..75c21965e7b503dcc7efd104d202fc0ad48b437e 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUrlUtil.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MarketplaceUrlUtil.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MpcProtocolFavoritesUrlHandler.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MpcProtocolFavoritesUrlHandler.class"
index 6e72ff377af3491d37da21ea3defc77473e1a266..abbcb6c777cd377884f3944f307677ce2751ddbf 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MpcProtocolFavoritesUrlHandler.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MpcProtocolFavoritesUrlHandler.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MpcProtocolSolutionUrlHandler.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MpcProtocolSolutionUrlHandler.class"
index d2691b4fdd9e8848187eb9e19fece8466facb7dd..af450f9b6cf9a1a297153f0d7d3d8e8a020da193 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MpcProtocolSolutionUrlHandler.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/MpcProtocolSolutionUrlHandler.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/SolutionUrlHandler$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/SolutionUrlHandler$1.class"
index 138bc88ec952ee3e6d523814d31103869b06ae33..9a1a2c2007b8ead93248d9ca66ce0ec5f921ed23 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/SolutionUrlHandler$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/SolutionUrlHandler$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/SolutionUrlHandler.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/SolutionUrlHandler.class"
index e2999253dfd965af19e7a6d8d936942cc7afc694..6229e60914c3706e701df93e0c820868aad5763b 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/SolutionUrlHandler.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/SolutionUrlHandler.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/UrlHandlerStrategy$Registry.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/UrlHandlerStrategy$Registry.class"
index 7472ab5b10a33064c3f76698cb10e1eaedc17947..87475adbc5398f837d274571707df7fa7821714b 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/UrlHandlerStrategy$Registry.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/UrlHandlerStrategy$Registry.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/UrlHandlerStrategy.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/UrlHandlerStrategy.class"
index f2f5c369cf36ad106de9750885d2d9c00183276e..bdcc72c4b9fe66ac18caeee4fbacc9c7be56df8f 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/UrlHandlerStrategy.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/urlhandling/UrlHandlerStrategy.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/ConcurrentTaskManager.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/ConcurrentTaskManager.class"
index c4b5d02a832ce8f8cded946a8e2e425dcbbdbde6..29531bfcb9f859a9bc79cad1d5404a5144b0153f 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/ConcurrentTaskManager.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/ConcurrentTaskManager.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/Messages.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/Messages.class"
index 494edd9a9220caf35372fbf2a1b3c0ac9fca338d..4540202e068f51ea5feca59988975173c22562f8 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/Messages.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/Messages.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/Util.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/Util.class"
index 755b2499919680ec3c0ff496da73edd0d9f04558..f38d5954b3edcc98f05e06b17fc9271a7f938a2c 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/Util.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/Util.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/messages.properties" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/messages.properties"
index 6010ec5e11130f3aea5c186eb4c1c27dc415ef55..6ed16f2ed607e7b7e6f5a0426dafee6bf83c6b67 100644
--- "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/messages.properties"
+++ "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/util/messages.properties"
@@ -1,3 +1,13 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bcb31fce5ed4b8258fd25d7628a4e417d0c1ceeffb2690774a817bdc7527ecb7
-size 645
+###############################################################################
+# Copyright (c) 2010, 2018 The Eclipse Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# The Eclipse Foundation - initial API and implementation
+###############################################################################
+ConcurrentTaskManager_multipleErrorsOccurred=Multiple errors occurred
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$1.class"
index 5c5b1950c72dafeb5a0e6d145824022390033018..71457bace5947c1c67d08d1c8385fee9746faa9c 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$2.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$2.class"
index 329330b6971a096d39ee4cffdd1a43da64dcc3d6..4dfd715a94be3d78dfb49d7eaede1ff27f560f8f 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$2.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$2.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$3.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$3.class"
index 1bffe2f3251c4ce2b25b3aa148dba414582c6a91..3aad94f12e9ff4259b3494c4850e935e62b0e466 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$3.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$3.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$4.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$4.class"
index dc058b4d366c34a069917ed18ad652dea206af77..6ce1bde3dc52176b33668b8e4d95d97a5ec32c33 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$4.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$4.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$5.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$5.class"
index c7e149ea1d96f83b2aeb7bbf128dec9a1b3513f7..e60420e765b9ed63745edcd385f2bb1605942056 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$5.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$5.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$6$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$6$1.class"
index 70409d7539b11352247c169f764e921d9f117231..348cec3551c96f06cebac98d8fc1d9441c3f620e 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$6$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$6$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$6.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$6.class"
index 6d50462571e694e6fb01840e5f61bdab424e1909..18011a9ffc840af9b73a5a79d4c999de2532451a 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$6.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$6.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$7.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$7.class"
index a343c8e28cf604537be98535141b2f1f13e1d0bf..517dcf67f9af2bbce63ed5e0cae39c8be7d29e1a 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$7.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem$7.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem.class"
index 6597e2fcde8426691be2f83b10af2b7d4aa85ba1..a16bc77b1fe7ffa65164891f541638d88781ee1f 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceDiscoveryItem.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog$1.class"
index 4a13415b288b52a7bec3839fd48377d8e0763204..4d6f5279d317282d10d6fab6544b7481a42a6429 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog$PageListener.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog$PageListener.class"
index ebfa7e86ea18407b887642cc1da9899f9a9b0d50..cf7f38d0e48976292d89d52bef97bc4688e385cc 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog$PageListener.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog$PageListener.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog.class"
index 1a7a0b410bf53db20602cb58330dc487aaae5a74..7d0d1a16317923a17786bb4a837549c778b8e9cd 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractMarketplaceWizardDialog.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractSimpleDiscoveryItem$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractSimpleDiscoveryItem$1.class"
index 93ed8ce182850def81ddfcc0e38b816cf2ef6102..83f5221e93636dc96176e2db375998c3140fc9f7 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractSimpleDiscoveryItem$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractSimpleDiscoveryItem$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractSimpleDiscoveryItem.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractSimpleDiscoveryItem.class"
index d0f07d785a0a35dbeea3c060c89aa84405feb858..8822fa078cd6b514e64d988eef6d9ea1224b44a6 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractSimpleDiscoveryItem.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractSimpleDiscoveryItem.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractTagFilter.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractTagFilter.class"
index 42c74791877a55cccd0997ab0fdf08684ee099c0..62f9d88f8c793e1528bff4996de28bcfe4a236e9 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractTagFilter.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractTagFilter.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractUserActionItem.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractUserActionItem.class"
index 7a7373bb761758af48c0cfc40dc1af92874bc0e3..b487a4a5cc46f3e9f84aa93d08b078f25948a48a 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractUserActionItem.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/AbstractUserActionItem.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ActionLink.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ActionLink.class"
index 51114b80b8734074053c6cf1a7b609fb582664ae..e089d8a0f9e782c0aa588e15ad5e69cfe13bdfac 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ActionLink.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ActionLink.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/BrowseCatalogItem.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/BrowseCatalogItem.class"
index e14b844b7a554b6d09a14fc5ccfd559ab7f9bca6..accb83d342f831f17de6d3be86971747510f4f46 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/BrowseCatalogItem.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/BrowseCatalogItem.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcher$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcher$1.class"
index 4c32d4256ac50e4c67b4434a75bf08d5a7f1668e..4938813a8a12cf27cf518453e8a2a30755637996 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcher$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcher$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcher.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcher.class"
index 97068d64cd969374ee5f5adef5e7397368fa7203..2c084acf010a500d50f3988a72b50c3d679d1152 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcher.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcher.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcherItem$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcherItem$1.class"
index 2b6988d22a04ea494f99d0c9837ef195f51b5019..c3dfd2a002c637f75460015e508d19b663328482 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcherItem$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcherItem$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcherItem.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcherItem.class"
index aeb5a6af5dd828b0ee4df196781feb4e481cde77..6f916909445b878d91dab31722ba5299970e9f5c 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcherItem.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogSwitcherItem.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogToolTip.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogToolTip.class"
index 97e6751918716981d1c0f6555e735f790693d5b1..85f40ee90d5f6be66ac0de509cc89c591ac92bc3 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogToolTip.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CatalogToolTip.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CheckboxTagFilter$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CheckboxTagFilter$1.class"
index 7269e927c70ea972c8cda5fa5f6b040280892a3b..3ca1787c35ee95330991c1bc81daddbc1fef96ed 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CheckboxTagFilter$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CheckboxTagFilter$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CheckboxTagFilter.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CheckboxTagFilter.class"
index bc131e30f5052169bfe956fbee3f1cef07514a0d..d5f49e9a68e2f89ae62d7413c610abebe523ee8d 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CheckboxTagFilter.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/CheckboxTagFilter.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ComboTagFilter$1.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ComboTagFilter$1.class"
index e4e8c0e310ed548ddcadee1d545ee26525c95636..587dcbf5bddfab2171fa57e4372e112f746531c8 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ComboTagFilter$1.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ComboTagFilter$1.class" differ
diff --git "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ComboTagFilter$CComboComboWrapper.class" "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ComboTagFilter$CComboComboWrapper.class"
index c7e37fbad80444c81455744720a39167073a855b..1bf76c563878b89564ad6e27c8e138772cbd0738 100644
Binary files "a/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ComboTagFilter$CComboComboWrapper.class" and "b/Java\345\274\200\345\217\221\347\216\257\345\242\203\345\256\211\350\243\205/eclipse-jee-2024-06-R-win32-x86_64/eclipse/configuration/org.eclipse.osgi/368/0/.cp/org/eclipse/epp/internal/mpc/ui/wizards/ComboTagFilter$CComboComboWrapper.class" differ
+
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+
+ 
+
+ 
+
+ 
+