feature(git): add keep local changes option #425
Conversation
jfroche
force-pushed
the
feature/keep-local-changes
branch
from
052db53
to
02e6e3b
Compare
| user => 'someUser', | ||
| } | ||
| ~~~ | ||
|
|
There was a problem hiding this comment.
Since the module is stringified Reference.md will be generated automatically with the required information.
##### keep_local_changes`
Valid values: true, false
Keep local changes on files tracked by the repository when changing revision
Default value: `false``
We can use this command to generate the contents in REFERENCE.md
bundle exec puppet strings generate --format markdown --out REFERENCE.md
|
Thanks for submitting the PR @jfroche .PR looks great. Thanks for your contribution. |
jfroche
force-pushed
the
feature/keep-local-changes
branch
2 times, most recently
from
7ce9510
to
c2aee8d
Compare
|
@sheenaajay tell me if the change is ok for you. Thank you! |
REFERENCE.md
Outdated
| @@ -141,3 +141,11 @@ Trust server certificate | |||
|
|
|||
| Default value: `false` | |||
|
|
|||
| ##### `keep_local_changes` | |||
There was a problem hiding this comment.
We can remove from line number 144 to 150. It will be generated automatically with stringify during the release step.
|
@jfroche Just a small comment. Rest of the changes looks good. Thank you. I have restarted travis job since the tests failed with time out error. |
Add an option to keep local changes when revision changes. As we do a `git checkout --force` all local modifications are removed. We just add an option that stash the modification before the checkout and unstash the modification after the checkout. This change is backward compatible, as by default, we keep the current behaviour and do not keep local modification.
jfroche
force-pushed
the
feature/keep-local-changes
branch
from
c2aee8d
to
d24ae7b
Compare
|
|
Add an option to keep local changes when revision changes.
As we do a
git checkout --forceall local modifications are removed.We just add an option that stash the modification before the checkout and
unstash the modification after the checkout.
This change is backward compatible, as by default, we keep the current
behaviour and do not keep local modification.