What's the simplest way to git conflicted files?
- by inger
I just need a plain list of conflicted files.
Is there anything simpler than:
git ls-files -u | cut -f 2 | sort | uniq
or
git ls-files -u | awk '{print $4}' | sort | uniq
?
Search Results
Search found 2 results on 1 pages for 'inger'.
Page 1/1 | 1
-
-
Using git-svn (or similar) just to help out with svn merge?
- by inger
Some complex subversion merges are coming up in my project: big branches that have been apart for a long time. Svn gives too many conflicts. Would it be any good to use git-svn just for the benefit of making the merge more manageable? (perhaps due to its powerful content model) Can you recommend other alternatives (eg. svk) to lessen the merge pain? Thanks in advance.Read the article
