Bug 507434 - Issue with stash after conflict
Summary: Issue with stash after conflict
Status: NEW
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
: 507433 (view as bug list)
Depends on:
Blocks:
 
Reported: 2016-11-13 06:21 EST by Yossi Balan CLA
Modified: 2017-08-28 05:10 EDT (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Yossi Balan CLA 2016-11-13 06:21:43 EST 
git stash apply doesn't return untracked file with there was a conflict, 

Reproducible: Always

Steps to Reproduce:
Create a conflict situation.
   Example:
     1) create new file in your repo -> fileA
     2 ) do dummy change in file that exist -> FileB
     3) git add fileA
     4) git add fileB
     5_ git stash save -u 
     6) do change in fileB
     7) git add fileB
     8) git commit -m "test"
     5) git stash apply (from Git Repository view)
I got conflict on fileA but the fileB is not return
Comment 1 Thomas Wolf CLA 2017-08-27 09:56:00 EDT 
*** Bug 507433 has been marked as a duplicate of this bug. ***
Comment 2 Thomas Wolf CLA 2017-08-28 05:10:50 EDT 
I cannot reproduce this with current EGit/JGit nightly.

File A is re-added, and a conflict on File B is reported and shown in File B with the usual <<</===/>>> markers:

  <<<<<<< HEAD
  B
  B
  =======
  BB
  >>>>>>> stash