Skip to:
Content

BuddyPress.org

Changes between Initial Version and Version 1 of Ticket #4949, comment 7


Ignore:
Timestamp:
06/10/2013 10:04:06 AM (11 years ago)
Author:
hnla
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #4949, comment 7

    initial v1  
    1 @Boone I've run into this same issue I have reported before, these git diff files do not play nicely with SVN for many and various reasons mostly to so with tortoise svn on windows but regardless of reason it's a major pita to spend the testing time trying to work out how to hack around the issue without success:
    2 This link explains some of the issues: http://stackoverflow.com/questions/708202/git-format-patch-to-be-svn-compatible
    3 
    4 My only recourse now to apply the changes manually as merge attempts fail.
     1Removed comments re pita issues between git/svn patches/diff as managed to run merge on git diff.