Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[jgit-dev] issue in stash - conflict case

Hi

 

I tried to do process with stash with jgit and I want to know if it is bug in jgit or not.

The scenario :

1.    I did change on file a.

2.    I created new file b

3.    do stash

4.    do change in file a.

5.    do commit

6.    do use stash

7.    call to get status -> get only one file in conflit but I didn't get the file untracked b.

 

I tried to do it also in eclipse Neon and  in https://orionhub.org/ and I got the same result.

In git bash and In intellij it is working and I succeed to get also the untracked file. ( not sure how they use git )

When I do scenario without the conflict ( meaning not change the same file in step 4 ) ,  I succeed to get back the untracked file .

Is it a bug ?

I checked It on old version on JGIT 3.4 but I guess the eclipseand orionHub use new version.

 

Regards,

Yossi


Back to the top