Skip to main content
Jump to: navigation, search

Difference between revisions of "EGit/New and Noteworthy/5.12"

m
Line 8: Line 8:
 
* ''Replace With→Ours/Theirs'' removes the file and stages the deletion if the file was deleted in the ours or theirs commit. Simplifies resolving modify-delete conflicts.
 
* ''Replace With→Ours/Theirs'' removes the file and stages the deletion if the file was deleted in the ours or theirs commit. Simplifies resolving modify-delete conflicts.
 
* ''Replace With→Ours/Theirs'' in Package Explorer/Project Explorer.
 
* ''Replace With→Ours/Theirs'' in Package Explorer/Project Explorer.
 +
  
 
<Planned>
 
<Planned>
 
* Merge Editor improvements
 
* Merge Editor improvements
 +
 +
== API ==
 +
 +
<Planned>
 +
* GitInfo API
  
 
== Other Changes ==
 
== Other Changes ==

Revision as of 02:19, 19 May 2021

EGit

UI

<TBD>

  • Staging view shows info about conflict type.
  • Replace With→Ours/Theirs removes the file and stages the deletion if the file was deleted in the ours or theirs commit. Simplifies resolving modify-delete conflicts.
  • Replace With→Ours/Theirs in Package Explorer/Project Explorer.


<Planned>

  • Merge Editor improvements

API

<Planned>

  • GitInfo API

Other Changes

EGit 5.12 includes some less noticeable improvements in the UI, plus a number of bug fixes. The complete list of new features and bug fixes is available in the release notes.

Contributors

The following X developers worked on this release:

<TBD: list of contributors, number>

See Also

See also the new features in JGit for additional information.

Back to the top