This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Repository navigation

Show files as conflicted in git panel when discard undo creates merge conflicts, handle various edge cases - #563

Merged

kuychaco merged 32 commits into

masterfrom

ku-show-conflicts-in-git-panel

Mar 3, 2017

Merged

Show files as conflicted in git panel when discard undo creates merge conflicts, handle various edge cases#563
kuychaco merged 32 commits into
masterfrom
ku-show-conflicts-in-git-panel

Commits on Feb 23, 2017
- Add test for GSOS#mergeFile
  kuychaco
  committed
  ca3687e
Commits on Feb 24, 2017
- Implement GSOS#getFileMode(fileName)
  kuychaco
  committed
  0763353
- Implement GSOS#updateIndex
  kuychaco
  committed
  c35db7b
- Handle null oursSha or theirSha in updateIndex
  kuychaco
  committed
  5daf3a5
- Update index for conflicts on restoration of discarded changes
  kuychaco
  committed
  84d451b
- Merge remote-tracking branch 'origin/master' into ku-show-conflicts-in-git-panel
  kuychaco
  committed
  97c4d4d
- Use consistent ours/theirs/commonBase language
  kuychaco
  committed
  bdc9de2
- Add test for GitController#discardWorkDirChangesForPaths
  kuychaco
  committed
  61eaf73
- Fix test description
  kuychaco
  committed
  1d5364a
- :fire: empty line
  kuychaco
  committed
  79a6487
- Pass tooltips to GitController in tests
  kuychaco
  committed
  b52b602
- :fire: unused option from GSOS#diffFileStatus
  kuychaco
  committed
  65858ee
- :art: use git.exec rather than git.diffFileStatus
  kuychaco
  committed
  4cb9d0c
Commits on Feb 25, 2017
- :art: test to use getFileContents helper function
  kuychaco
  committed
  352b9af
- Add `~` to beginning of filename for merge results
  kuychaco
  committed
  a27ed97
- More specific error catching in GSOS#createBlob
  kuychaco
  committed
  e9c46bf
- Handle case of deleted files
  kuychaco
  committed
  22458df
Commits on Feb 27, 2017
- :shirt:
  kuychaco
  committed
  862c0a5
- Add tests for undoing discard in an added file
  kuychaco
  committed
  d8686e1
Commits on Mar 3, 2017
- Make GSOS#checkoutFiles no longer delete untracked files
  kuychaco
  committed
  8ee9dd2
- Add isFileExecutable helper
  kuychaco
  committed
  79f901d
- :art: GSOS#getDiffForFilePath to use isFileExecutable helper
  kuychaco
  committed
  b950c38
- Make GSOS#getFileMode handle untracked files
  kuychaco
  committed
  b247137
- Make GSOS#updateIndex handle the case when commonBaseSha is null
  kuychaco
  committed
  cd91dcd
- Make DiscardHistory#mergeFiles handle case of added files
  kuychaco
  committed
  0440a0c
- Merge remote-tracking branch 'origin/master' into ku-show-conflicts-in-git-panel
  kuychaco
  committed
  bc4477e
- :shirt:
  kuychaco
  committed
  d29cd8a
- Make GSOS#updateIndex a write operation
  kuychaco
  committed
  73941ff
- Rename `updateIndex` -> `writeMergeConflictToIndex`
  kuychaco
  committed
  65c38b5
- Use `createTestStrategy` instead of instantiating GitShellOutStrategy
  kuychaco
  committed
  867f9b2
- Make getFileMode test work on windows
  kuychaco
  committed
  56f158c
- Fix bug undoing discard for file in subdirectory (fixes #588)
  kuychaco
  committed
  0003447

Commits

Commits on Feb 23, 2017

Commits on Feb 24, 2017

Commits on Feb 25, 2017

Commits on Feb 27, 2017

Commits on Mar 3, 2017