Jump to content

JarJarThomas

Members
  • Content Count

    12
  • Joined

  • Last visited

Community Reputation

0 Neutral

About JarJarThomas

  • Rank
    Member
  1. Hi while evaluating i come to the situation that i created the same directory in two different branches adding different files to it. (At least i think it was what happend). Now the merge failes because of a conflict in the directory merge. A dialog pops up where i can select the files and rename the folders. But what i really would have liked would be a way to integrate both directories. Greetings Thomas
×
×
  • Create New...