Feature request: Support mechanism to apply changes patch (handling conflicts)

[akphi]

Context and Motivation

We allow users to download a patch for their local changes, but there's no way to apply it. This might play out as a mini conflict-resolver (i.e. think of when we do git stash pop/apply and have to resolve the conflicts then), so the UI work might be quite involving. Nevertheless, this is a natural step to improve the current SDLC as it helps users recover their workspaces, and will help with working within a group workspace in particular (see #461)

Conflicts in patch and local changes will be handled by #756

---

UPDATE

Partially resolved in #748
We can follow what @MauricioUyaguari did in #749 to create a conflict resolution flow for patch applier.

Also, let's address the comments left in #748

[akphi]

Moved this out of 3.0.0 as the core part is already handled in #748 . The enhancement to handle conflict resolution can be done later