diff options
Diffstat (limited to 'doc/university/training/topics/stash.md')
| -rw-r--r-- | doc/university/training/topics/stash.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/university/training/topics/stash.md b/doc/university/training/topics/stash.md index db4a21da6ba..051103e5f4b 100644 --- a/doc/university/training/topics/stash.md +++ b/doc/university/training/topics/stash.md @@ -1,7 +1,7 @@ --- stage: none group: unassigned -info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers +info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments comments: false --- @@ -55,7 +55,7 @@ and we need to change to a different branch. ``` - If we meet conflicts we need to either reset or commit our changes. -- Conflicts through `pop` will not drop a stash afterwards. +- Conflicts through `pop` doesn't drop a stash afterwards. ## Git Stash sample workflow |