Ran
|
Jobs
6
|
Files
274
|
Run time
5min
|
Badge
Embed ▾
README BADGES
|
travis-ci
<a href="https://github.com/nvbn/thefuck/commit/<a class=hub.com/nvbn/thefuck/commit/2e8d3566fc37b41ce8e3c6eda81a79ae8591cd00">2e8d3566f<a href="https://github.com/nvbn/thefuck/commit/2e8d3566fc37b41ce8e3c6eda81a79ae8591cd00">">Fix `git stash pop` with local changes When there are local changes to a file, and a git stash is popped that contains other changes to that same file, git fails as follows: $ git stash pop error: Your local changes to the following files would be overwritten by merge: src/index.js Please commit your changes or stash them before you merge. Aborting $ This change adds a rule that corrects this problem as suggested [here]: $ git stash pop error: Your local changes to the following files would be overwritten by merge: src/index.js Please commit your changes or stash them before you merge. Aborting $ fuck git add . &amp;&amp; git stash pop &amp;&amp; git reset . [enter/↑/↓/ctrl+c] Auto-merging src/index.js On branch flow Changes to be committed: (use &quot;git reset HEAD &lt;file&gt;...&quot; to unstage) modified: src/index.js Changes not staged for commit: (use &quot;git add &lt;file&gt;...&quot; to update what will be committed) (use &quot;git checkout -- &lt;file&gt;...&quot; to discard changes in working directory) modified: src/index.js Dropped refs/stash@{0} (</a><a class="double-link" href="https://github.com/nvbn/thefuck/commit/<a class="double-link" href="https://github.com/nvbn/thefuck/commit/f94776d484c4278997ac6837a7b138b9b9cdead1">f94776d48</a>">f94776d48</a><a href="https://github.com/nvbn/thefuck/commit/2e8d3566fc37b41ce8e3c6eda81a79ae8591cd00">) Unstaged changes after reset: M src/index.js $ [here]: https://stackoverflow.com/questions/15126463/how-do-i-merge-local-modifications-with-a-git-stash-without-an-extra-commit/15126489#15126489
17 of 17 new or added lines in 2 files covered. (100.0%)
4051 of 4340 relevant lines covered (93.34%)
5.43 hits per line
ID | Job ID | Ran | Files | Coverage | |
---|---|---|---|---|---|
1 | 1141.1 | 274 |
92.58 |
Travis Job 1141.1 | |
2 | 1141.2 | 274 |
89.84 |
Travis Job 1141.2 | |
3 | 1141.3 | 274 |
89.84 |
Travis Job 1141.3 | |
4 | 1141.4 | 274 |
90.07 |
Travis Job 1141.4 | |
5 | 1141.5 (FORMULA="python") | 274 |
90.23 |
Travis Job 1141.5 | |
6 | 1141.6 (FORMULA="python3") | 274 |
89.95 |
Travis Job 1141.6 |
Coverage | ∆ | File | Lines | Relevant | Covered | Missed | Hits/Line |
---|