Description
Consider the following situation:
You have a git repository checked-out in Eclipse with one or more [Java] projects. There are local uncommited changes to one or more files. From a remote repository you have fetched commits you want to apply but you can't because git pull fails because of conflictiung local and remote changes.
In this situation you open the Team Synchronization perspective by executing the command Team -> Synchronize Workspace.
The "Team Synchronizing" perspective opens and shows the incoming / outgoing changes
You enable the Conflicts Mode button to view only conflicting changes.
Now you see the conflicting changes and you want to revert the conflicting file to make it possible to perform pull. But there is no way to do so on the "Team Synchronizing" perspective (or at least I haven't found a way).
The screenshot shows the possible actions I see on such a conflicting file. None of them seems to helpful in this situation.
It would be easy if the file context menu would provide an action Replace with HEAD revision as it is e.g. present in the context menu of entries in the "Unstaged Changes" view.
Motivation
Git and EGit are bad in handling situations where local changes conflict with remote changes and you don't wan't to stash the changes but instead overwrite the local changes. The Team Synchronization perspective seems to be an easy way to present and solve such conflicts and allow the user to solve it in a structured way.
Alternatives considered
No response
Additional context
No response
Description
Consider the following situation:
You have a git repository checked-out in Eclipse with one or more [Java] projects. There are local uncommited changes to one or more files. From a remote repository you have fetched commits you want to apply but you can't because
git pullfails because of conflictiung local and remote changes.In this situation you open the Team Synchronization perspective by executing the command
Team->Synchronize Workspace.The "Team Synchronizing" perspective opens and shows the incoming / outgoing changes
You enable the
Conflicts Modebutton to view only conflicting changes.Now you see the conflicting changes and you want to revert the conflicting file to make it possible to perform
pull. But there is no way to do so on the "Team Synchronizing" perspective (or at least I haven't found a way).The screenshot shows the possible actions I see on such a conflicting file. None of them seems to helpful in this situation.
It would be easy if the file context menu would provide an action
Replace with HEAD revisionas it is e.g. present in the context menu of entries in the "Unstaged Changes" view.Motivation
Git and EGit are bad in handling situations where local changes conflict with remote changes and you don't wan't to stash the changes but instead overwrite the local changes. The Team Synchronization perspective seems to be an easy way to present and solve such conflicts and allow the user to solve it in a structured way.
Alternatives considered
No response
Additional context
No response