search

HiromuHota / pdi-git-plugin

SpoonGit allows you to manage versions of local Kettle files without leaving Spoon. In addition to Git, Subversion is also supported.
Apache License 2.0
29 stars 12 forks source link

Show the changes from other people / maybe warning after pull #3

Closed HiromuHota closed 7 years ago

HiromuHota commented 7 years ago

It might be good to show the changes between the Kettle file in edit and the one just pulled from a remote.

Scenario

  1. User A opens a Kettle file in his Spoon and makes some change.
  2. User B edits the same file and pushes it to a remote repository.
  3. User A pulls the commit.
  4. User A saves the file without noticing that it overwrites the change of User B.
HiromuHota commented 7 years ago

Resolved by 64d246ca46120f11fd34365e9584db6c63b54bc1 (To avoid accidental loss of work, abort merge/pull if one or more tabs have unsaved changes) Can be re-opened when another strategy is preferred.