mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Browse source
This commit is contained in:
Lukey 2023-12-30 10:51:29 +00:00 • committed by admin
parent b4dd62235a
commit 6419936626
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/No_way_to_merge_conflicts_while_on_adjusted_branch.mdwn
View file

@ -1,5 +1,5 @@
### Please describe the problem. ### Please describe the problem.
While on an adjusted branch, merge conflicts neither manually nor with a git merge driver. See the transcript below. While on an adjusted branch, merge conflicts can neither be resolved manually nor with a git merge driver. See the transcript below.
### What version of git-annex are you using? On what operating system? ### What version of git-annex are you using? On what operating system?