and merge two php files
I've tried using win merge but because the code is more than 2k line, and there are much difference between those files, i can't do it easily
Someone can please tell me best practice? Or is there a way to do compare and merge much difference code beside compare it manually line per line ?
Thanks in advance.
So u don't need to compare anything, just merge recklessly?
2k is not that like a lot of lines... what about separate every function or class on separated files and diff every file
Play with ignore (spaces,tabs) and normalize (line separator) options. Separate in logical blocks as suggested by @PkW4r10
Обсуждают сегодня