Add ProjectUtil.refreshRepositoryResources

Refreshes resources of repository-relative paths within a repository.

Change-Id: I35a537a8d5ec1de20fdcd0b757faadde28b64845
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Make DiscardChangesOperation work for non-resources

Uses the new ProjectUtil.refreshRepositoryResources from the parent
change to correctly refresh the resources that were possibly affected.

Change-Id: I1c2bc7fdc9a673d33d1cf84b43894937f2cd27c6
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Support checking out stage with DiscardChangesOperation

For resolving conflicts, we want to be able to do `git checkout --ours`
or `git checkout --theirs` for a path.

Change-Id: Ia6d003993ad1016602ff960203b3526cd884bad2
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
[stagingView] Add "Replace With > Ours/Theirs" menu for conflicts

Note that this also requires JGit change
Ie2b3685d958c09b241991b74e6177401e8a1ebc9 for it to work for add/add
conflicts.

To get a nicer "theirs" in case of rebasing, reading some of the files
in .git/rebase-merge/ would be required.

Change-Id: I9e1ddb7bb2cf295fcb6d18ffa4393fcc6dac605e
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>