Geek Answers Handbook

Svn binary conflict resolution

I am using svn for an im project working with several other developers. Svn works great for version control, but we all go to conflicts when we pass the dll.

When I resolve the conflict (which deletes my DLLs, since they cannot process binary files), I need to rebuild to commit. How are you going to resolve such conflicts?

Edit:

DLL files are located in a separate svn folder, since the project is a game mode, and not programmers need access to the latest builds.

+5
source share
6 answers

: DLL. , , diff, DLL :

Subversion :

filename.mine

, , , . . ( Subversion , .mine , .)

filename.rOLDREV

, BASE, . , , .

filename.rNEWREV

, Subversion . HEAD .

OLDREV - .svn, NEWREV - HEAD.

, , , :

  • DLL, filename.rOLDREV, filename.rNEWREV
  • dll , filename.roldREV filename.mine, filename.rNEWREV

svn resolved filename

Subversion, .

+7

DLL, ( , ), , .

, svn: external.

+8

, DLL . , ?

, - - . , , , - . :

  • DLL EXE
  • , , , .
  • DLL, , , , . , - , .

, DLL , . , (.tar.gz ..) , Makefile, ./p >

+3

:

  • , .

  • .

. , , , .

+1

, dll svn:mime-type, application/octet-stream - .

svn propget *.dll
svn propset svn:mime-type application/octet-stream *.dll

, .

.

0

, *.dll , :

  • , , *.dll , , . ( ( , - , ))
  • .
  • .

:

, - , , .

:

  • dlls ( - " " )
  • DLL .
  • Let your colleagues know that you will complete a new audit (you can let this step go)
  • Finish your work, if there is a conflict, it should be their mistake.

You now have two options:

5a. You are an asshole and solve the problem, keeping mine.

5 B. You work the way it should work ... Read the log file and find out who also completed the short time you need to copy your work to a folder and press commit. Talk to this colleague. Agree to a further course of action.

0
source

More articles:


All Articles