Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

source code position changes in cbp file

<< < (2/2)

ollydbg:

--- Quote from: jens on September 08, 2016, 07:24:08 am ---
--- Quote from: ollydbg on September 08, 2016, 04:00:20 am ---
--- Quote from: oBFusCATed on September 06, 2016, 04:21:07 pm ---1. Apply the same patch just modify the file names
2. Use difftool to unify all the project files.

--- End quote ---
Thanks, what does the second step mean?

--- End quote ---
Use a tool that shows (and merges) diffs between files.
I prefer meld, because it works quiet good (and in the same way) on Linux and Windows: http://meldmerge.org/ .

--- End quote ---
Thanks for the explanation. Meld is a great tool, but when using meld to merge files, I see that copy some text from one side editor to another side does not works quite well, so I finally configure my windows git to use TortoiseDiff tool.  ;)

Navigation

[0] Message Index

[*] Previous page