proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-04 14:33:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stash: document merge conflicts

Browse Source
This commit is contained in:
Edward Thomson 2015-05-01 13:53:46 -04:00
parent f0957589ee
commit 958950b6e0
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/git2/stash.h
View File

@ -82,19 +82,16 @@ typedef enum {
/** /**
* Apply a single stashed state from the stash list. * Apply a single stashed state from the stash list.
* *
* If any untracked or ignored file saved in the stash already exist in the * If local changes in the working directory conflict with changes in the
* workdir, the function will return GIT_EEXISTS and both the workdir and index * stash then GIT_EMERGECONFLICT will be returned. In this case, the index
* will be left untouched. * will always remain unmodified and all files in the working directory will
* * remain unmodified. However, if you are restoring untracked files or
* If local changes in the workdir would be overwritten when applying * ignored files and there is a conflict when applying the modified files,
* modifications saved in the stash, the function will return GIT_EMERGECONFLICT * then those files will remain in the working directory.
* and the index will be left untouched. The workdir files will be left
* unmodified as well but restored untracked or ignored files that were saved
* in the stash will be left around in the workdir.
* *
* If passing the GIT_APPLY_REINSTATE_INDEX flag and there would be conflicts * If passing the GIT_APPLY_REINSTATE_INDEX flag and there would be conflicts
* when reinstating the index, the function will return GIT_EUNMERGED and both * when reinstating the index, the function will return GIT_EMERGECONFLICT
* the workdir and index will be left untouched. * and both the working directory and index will be left unmodified.
* *
* @param repo The owning repository. * @param repo The owning repository.
* @param index The position within the stash list. 0 points to the * @param index The position within the stash list. 0 points to the
@ -102,8 +99,9 @@ typedef enum {
* @param checkout_options Options to control how files are checked out * @param checkout_options Options to control how files are checked out
* @param flags Flags to control the applying process. (see GIT_APPLY_* above) * @param flags Flags to control the applying process. (see GIT_APPLY_* above)
* *
* @return 0 on success, GIT_ENOTFOUND if there's no stashed state for the given * @return 0 on success, GIT_ENOTFOUND if there's no stashed state for the
* index, or error code. (see details above) * given index, GIT_EMERGECONFLICT if changes exist in the working
* directory, or an error code
*/ */
GIT_EXTERN(int) git_stash_apply( GIT_EXTERN(int) git_stash_apply(
git_repository *repo, git_repository *repo,