Pastebin

Paste #2168: merge problem

< previous paste - next paste>

Pasted by chrivers

Download View as text

[chrivers@eos]~/metaconfig-dev #svn merge https://svn.sikkerhed.org/svn/software/projects/spye-metaconfig@1989
--- Merging r1718 through r1989 into '.':
   C spye-metaconfig/plugins/metaconfig/server
   C spye-metaconfig/plugins/metaconfig/convert.py
   C spye-metaconfig/plugins/metaconfig/scripting.py
--- Merging r1718 through r1989 into 'spye-metaconfig/plugins/metaconfig/handler/group.py':
 U   spye-metaconfig/plugins/metaconfig/handler/group.py
--- Merging r1718 through r1989 into '.':
   C spye-metaconfig/plugins/metaconfig/handler/xen.py
   C spye-metaconfig/plugins/metaconfig/client
Summary of conflicts:
  Tree conflicts: 5

New Paste

Go to most recent paste.

Backed by:

PostgreSQL Professional Services

Debian Linux Support