Regarding handling of stashes when applying remote changes

[takaakik]

When applying remote changes from GIT to a development application, if a file is updated in the instance to which the remote changes are applied and a stash occurs, I understand that the following behavior will occur, but is this correct?

1.The updates made in the instance to which the remote changes are applied are saved to the stash
             ↓
2.The GIT file is reflected in the instance (the stashed changes are overwritten and disappear)
            ↓
3.The changes saved in 1 are restored from the stash.

If the above is correct, is it correct to understand that after performing 2, and until 3 is completed, the application will operate without the stash being reflected (with the code obtained from GIT)?

ServiceNow uses xanadu Patch 4.

[BurtCrepeault]

Hi, I realize this has been asked a long time ago, but you are right. Said in other, more Git-like words, your steps are:

1. Local changes are stashed locally

2. Remote changes are applied

3. Local stash is restored

And yes, if you don't reapply the stashed changes, you are running the Git version of the code. If that is to be final, you can delete the stash from the Manage stashes dialog under the Source Control menu in Studio. There's likely the same functionality in the more recent ServiceNow Studio.