 Giorgio Previtera
|
ac5cbc1d2c
|
#480 Allow cycling side panels with number keys
|
2019-10-27 12:39:08 +11:00 |
|
|
Giorgio Previtera
|
827837b0b9
|
477 Remove unnecessary variable check
hasInlineMergeConflicts is always true with hasMergeConflicts is true
|
2019-07-27 11:05:23 +10:00 |
|
|
Giorgio Previtera
|
e83ef9858b
|
#477 Remove NeedMerge boolean
Instead of storing the status in a new variable, derive it from
the existing three fields
|
2019-07-27 11:05:23 +10:00 |
|
|
Giorgio Previtera
|
504d506575
|
477 Add new NeedReset property to File and update tests
Use a boolean to determin if a file needs to be reset. We want to reset
the file when discrading changes if there is a conflict.
|
2019-07-27 11:05:23 +10:00 |
|
|
Giorgio Previtera
|
823b436b53
|
477 Remove duplicate checkout
We already checout the file calling `c.DiscardUnstagedFileChanges`
|
2019-07-27 11:05:23 +10:00 |
|
|
Giorgio Previtera
|
212327d746
|
#477 Discard changes when there are merge conflicts
If there are merge conflicts, reset the file and discard all changes
|
2019-07-27 11:05:23 +10:00 |
|
|
Giorgio Previtera
|
b60ecdaa24
|
472 - Update error message
|
2019-07-14 14:24:18 +10:00 |
|
|
Giorgio Previtera
|
9fb9962ce7
|
472 - Don't panic if not in a repository
Display a friendly message and exit with an error if not
in a Git repository. Using the same approach used in this PR:
https://github.com/jesseduffield/lazydocker/pull/14/files
|
2019-07-14 14:24:18 +10:00 |
|