|
|
|
|
|
|
by erik_seaberg
1979 days ago
|
|
|
> Best practices to prevent tree conflicts during merge are simple: limit file and folder renames in branches, prefer to refactor code in the trunk. Now every team member who was editing any of those files is boned in a way they probably can’t recover without expert help. git makes assumptions that work in practice, svn does not, and svnmerge.py conflict hell has cost hours of my life that I would dearly like to extract from the the creators of that pile of fun. |
|
|