mirror of
https://github.com/jorgebucaran/fisher
synced 2024-09-14 15:17:39 +02:00
Close #122.
This commit is contained in:
parent
9e5656ff37
commit
9e76f930cf
1 changed files with 1 additions and 1 deletions
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
## [0.9.0][v090] - Not released yet
|
## [0.9.0][v090] - Not released yet
|
||||||
|
|
||||||
* Update plugins with merge conflicts by fetching HEAD and applying a hard reset as a last resort. This strategy is only executed on the `master` branch, other branches are not affected. If branch `my-feature` is checked out at the time of the update, Fisherman first saves the branch name, checks out master, updates and checks out `my-feature` again after the operation is complete.
|
* Update plugins with merge conflicts by fetching HEAD and applying a hard reset as a last resort. This strategy is only executed on the `master` branch, other branches are not affected. If branch `my-feature` is checked out at the time of the update, Fisherman first saves the branch name, checks out master, updates and checks out `my-feature` again after the operation is complete. Close #122.
|
||||||
|
|
||||||
* Update plugins with a dirty working tree by recording changes in the stash and re-reapplying them again after the git-pull update strategy completes.
|
* Update plugins with a dirty working tree by recording changes in the stash and re-reapplying them again after the git-pull update strategy completes.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue