Easily find issues by searching: #<Issue ID>
Example: #1832
Easily find members by searching in: <username>, <first name> and <last name>.
Example: Search smith, will return results smith and adamsmith
| Dev |
|
| QA |
|
| Priority | Low |
| Complexity | Unknown |
| Component | App - Version Control - GIT |
| Version | Future - .1 |
If when applying a Stash there exists conflicts with the files from the working tree, currently, as in ADStudio 14 Dev 13, only one file conflict is shown in the error dialog.
The suggestion would be to show all the file conflicts as displayed when calling the git stash apply command.
A possible scenario in order to reproduce the above:
* modify 2 or more existing versioned files
* open the Repository Browser and create a Stash
* apply the created Stash above
* modify the same files again
* try to apply the created Stash once more
This is how the jGit api works. When we call stash apply - before applying changes it scans for conflicts by iterating the file changes one by one. It throws conflict error once it finds a conflict and does not proceed further.
If you think this issue is important to fix please re-assign it to a later AD Studio version so that we can check back to see if the jGit api is enhanced to handle this use case.
OK, I'll be moving it for a feature version.
OK, I'll be moving it for a feature version.
Issue #8394 |
| Closed |
Completion |
| No due date |
| No fixed build |
| No time estimate |
This is how the jGit api works. When we call stash apply - before applying changes it scans for conflicts by iterating the file changes one by one. It throws conflict error once it finds a conflict and does not proceed further.
If you think this issue is important to fix please re-assign it to a later AD Studio version so that we can check back to see if the jGit api is enhanced to handle this use case.