|
|
|
Re: Resetting a specific file [message #759348 is a reply to message #759321] |
Mon, 28 November 2011 13:09 |
|
As R Shapiro said you can use "Replace With" in eg. package explorer context menu.
You can also use "Overwrite" from file context menu in Synchronize view in "Workspace" presentation model. The "Overwrite" in Synchronize view is equivalent to "Replace With" -> "HEAD revision" from package explorer file context menu and it will restore version latest version of given file in this branch. If you would like to restore version from another branch you need to use "Replace With" -> "Branch, Tag, or Reference..." and then select source branch.
|
|
|
Re: Resetting a specific file [message #759352 is a reply to message #759321] |
Mon, 28 November 2011 13:24 |
R Shapiro Messages: 386 Registered: June 2011 |
Senior Member |
|
|
The nightly build has an 'Overwrite' option in the Synchronize view. I don't know for sure what the semantics are here, in particular where it will overwrite from the HEAD, the Index, or the last commit fetched from whichever remote you're synchronizing against. One of the egit authors can no doubt answer that question.
Either way, I think you'll find it more straightforward to perform operations like this from an Explorer view using 'Replace With'. It's a bit roundabout to go through the work of synchronizing if you already know exactly what you want to do. Certainly 'Replace With' is much more explicit about what it will be doing.
In general I've noticed a tendency for Eclipse users to go through synchronization for no particular reason. This is true with subversive/subclipse and cvs, as well as egit. Unless you want to do detailed comparisons of multiple files, there's no reason in any Team provider to pay the price of synchronization.
[Updated on: Mon, 28 November 2011 13:28] Report message to a moderator
|
|
|
|
Re: Resetting a specific file [message #1721868 is a reply to message #759352] |
Mon, 01 February 2016 08:04 |
|
I trapped in similar question and feedl like beeing in yak hair studio.
I am in the sync view as i want to sync my local changes with remote master.
Then after some time i have the situation i wanna throw away my changes and leave the one on the master as it which conflits my changes, that means don't change it locally go back to last fetch from remote master.
I choose "overwrite".
The first thing which feels wrong is that i have to mark the file as "merged" to get away the "conflict state" . Why is that so .. ? Overwite is pretty clear what is says, so why acklowledge that again - useless.
The second thing which is much worse is that when i commit now the repo the "unchanged file" is listed in the commit view ..what the hell? I didnd't changed it and said use the one from remote master like last fetch. There is no need to commit the file with changes from other devs from master.
The plugin should here remote the change from index, shouldn't it?
|
|
|
Powered by
FUDForum. Page generated in 0.04431 seconds