Git stash pop behaviour with

This issue has been created since 2020-11-02.

Reproduction steps

  • In branch A with master as remove we have a new file untracked.
  • In master we have added the same file already and it's part of commit a123

we are updating branch A to the commit a123 so we are doing:

var stash = repository.Stashes.Add(signature, StashModifiers.IncludeUntracked);
repository.Merge('a123', signature);

if (stash != null)
{
	repository.Stashes.Pop(0);
}

if(repository.Index.Conflicts.Any()){
      showUserAllTheConflictsAndGiveOptionsToFixThem
}

Expected behavior

When doing the Pop the change should get marked as having a conflict and being modified

Actual behavior

There won't be any conflicts even though the file is marked as modified and has been modified with the conflict markers

Version of LibGit2Sharp (release number or SHA1)

0.27.0-preview-0034

Operating system(s) tested; .NET runtime tested

Windows Server 2012; .NET 4.7.2

More Details About Repo
Owner Name libgit2
Repo Name libgit2sharp
Full Name libgit2/libgit2sharp
Language C#
Created Date 2011-02-26
Updated Date 2022-09-26
Star Count 2663
Watcher Count 130
Fork Count 822
Issue Count 373

YOU MAY BE INTERESTED

Issue Title Created Date Comment Count Updated Date
can't install with go 2 2021-12-16 2022-09-15
Please add a list of supported cryptos to the README 1 2021-10-17 2022-09-15
Monthly date patterns are not possible with providing a value for the day because of a regex check 0 2022-09-01 2022-09-24
Messages aren't deleting? 1 2021-12-22 2022-09-24
Support for TLS Data Directory 0 2021-10-01 2022-08-11
Session Information («Information → Session Info») always empty. 2 2021-12-05 2022-08-23
[ Feature Request ] Add posibility to change colors of components 3 2021-10-27 2022-09-19
GEVI has implemented CAPTCHA and has broken our agent 5 2022-03-14 2022-05-28
SWD regression on scan targets(SW-DP scan failed!) 11 2022-03-24 2022-09-17
__PRETTY_FUNCTION__ gets method names with a 10% chance of occasional garbled code 2 2021-06-22 2022-09-29
ARP.EXE - System Error 5 2021-07-06 2022-04-17
Getting Validation Error while helm install 0 2021-02-09 2022-01-31
Loadbalancing with external load balancer 0 2021-01-27 2022-01-14
典型テク集の部分の是非について 0 2021-03-13 2022-01-06
align と $$ が上手く機能しない 3 2021-03-26 2022-01-06
[アルゴリズム]: Ford-Fulkerson 法 0 2021-03-28 2022-01-06
[アルゴリズム]: Dinic 法 0 2021-03-28 2022-01-06
Provide review comments for newly published NIST PubID draft document 11 2021-08-27 2022-09-20
Symbol’s function definition is void: uninstallable 3 2021-09-24 2022-09-24
cannot find package "." when build docker-cli 2 2021-10-13 2022-09-17
figma_age listening on MacOS port after deleting Figma - How to uninstall / remove this 3 2019-11-13 2022-09-26
resize() function not taking arguments 0 2022-09-12 2022-09-16
Smallest possible compiler for building Lua modules from LuaRocks 6 2020-11-14 2022-08-16
按照文档复制的代码,显示不出来转盘,页面是空白的 8 2021-11-12 2022-08-19
Forbidden with Application Default Credentials 4 2022-02-18 2022-09-17
Electrum Rust Server running but Electrum wallet is "not connected" 17 2021-09-05 2022-09-08
Request: Support /.../i syntax 3 2021-05-17 2022-08-27
Address vulneraibilities as part of 1.13.1 / 1.14.0 images 0 2022-02-18 2022-07-29
1.6 support? 2 2021-10-09 2022-01-10
fiber_wakeup() in C works in dangerous cases 0 2021-10-12 2022-09-04
IMSDK Message.java的cloudCustomString不会持久化 3 2021-09-24 2022-09-26
Manual approval required for workflow run 2630220185 2 2022-07-07 2022-09-22
Manual approval required for workflow run 2630192892 0 2022-07-07 2022-09-12
Changed error behavior in array_chunk in php 8 1 2022-05-18 2022-09-17
AWS EKS - Self managed nodegroups / Unmanaged nodegroups 3 2021-05-13 2022-08-26
Running k-bench against the OpenShift 4.6 cluster keeps printing the `Unauthorized` error 0 2021-10-21 2022-09-23
Missing validation rules error when trying to auto import extensions in v2.8.6 4 2022-01-14 2022-09-21
SSO between two iOS native B2C apps not working 4 2021-07-09 2022-08-16
Default enableIngress value not reflected properly in admin UI 0 2021-12-21 2022-09-23
`npx dendron publish init` not finishing 4 2022-03-30 2022-04-07
It says I need Mac OS 10.15 0 2022-02-07 2022-09-02
lz4 1.9.3 cli tool is not able to compress block devices 2 2022-05-26 2022-09-02
Antrea end to end UX 4 2021-12-02 2022-09-22
mm3hash should be moved to `blender_utils.py` 0 2021-06-12 2022-08-23
Trace does not capture network traffic 2 2021-09-14 2022-09-24
[ENH] Add segmentation metrics with neighborhood tolerance 1 2022-09-10 2022-09-22
[BUG] make_reduction causes misleading Exception on NaN values: `ValueError: Input X contains NaN.` 8 2022-09-09 2022-09-22
lucet-wasi: convert sched_yield to yield Lucet instance 1 2019-11-05 2022-09-11
First start 0 2020-08-09 2021-12-16
Admin client is missing list_offsets 0 2021-11-12 2022-09-17