ome / scc

OME tools for managing the Git(Hub) workflow
https://pypi.org/project/scc/
GNU General Public License v2.0
0 stars 15 forks source link

Conflict detection diff filter #200

Closed manics closed 9 years ago

manics commented 9 years ago

--diff-filter=U should pick up unmerged files on all versions of git (as opposed to -u in git 2.2.1 which picks up everything except unmerged files, but seemed to work, presumably because the files matched some other criteria).

sbesson commented 9 years ago

See https://ci.openmicroscopy.org/view/Failing/job/SCC-merge/522/