Package: git
Version: 1:2.0.0-1
Severity: wishlist
Tags: upstream
>From #git:
deric_skibotn> I did a merge and have a resolution conflict with a submodule,
not sure what to do next
deric_skibotn> git status on the directory is "both modified:"
deric_skibotn> git submodule update ... => "Skipping unmerged submodule"
deric_skibotn> How do I point the submodule at the repos' newest commit?
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
