Похожие чаты

Hy gus, I'm facing a condition where i need to compare

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.

3 ответов

13 просмотров

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

Похожие вопросы

Обсуждают сегодня

Господа, а что сейчас вообще с рынком труда на делфи происходит? Какова ситуация?
Rꙮman Yankꙮvsky
29
А вообще, что может смущать в самой Julia - бы сказал, что нет единого стандартного подхода по многим моментам, поэтому многое выглядит как "хаки" и произвол. Короче говоря, с...
Viktor G.
2
@Benzenoid can you tell me the easiest, and safest way to bu.y HEX now?
Živa Žena
20
This is a question from my wife who make a fortune with memes 😂😂 About the Migration and Tokens: 1. How will the old tokens be migrated to the new $LGCYX network? What is th...
🍿 °anton°
2
30500 за редактор? )
Владимир
47
а через ESC-код ?
Alexey Kulakov
29
What is the Dex situation? Agora team started with the Pnetwork for their dex which helped them both with integration. It’s completed but as you can see from the Pnetwork ann...
Ben
1
Гайс, вопрос для разносторонее развитых: читаю стрим с юарта, нада выделять с него фреймы с определенной структурой, если ли чо готовое, или долбаться с ринг буффером? нада у...
Vitaly
9
Anyone knows where there are some instructions or discort about failed bridge transactions ?
Jochem
21
@lozuk how do I get my phex copies of my ehex from a atomic wallet, to move to my rabby?
Justfrontin 👀
11
Карта сайта