theNth
Results
2
comments of
theNth
If I'm not mistaken, there's a more fundamental, analogous issue with git rebase. Suppose you're working on a stack of commits where commits A and B both touch the text...
> We are trying to resolve LFS merge conflicts when merging one branch into another branch. Indeed. However, so far you have been trying to select the content of branch...