Re: Rebase

From: Al Grant <bigal.nz@gmail.com>
Date: Jan 19, 2025, 20:39 UTC
Message-ID: <CAODtcdfS+TVmrwohtHFUXRZRwC1WmF5ENpZLVoZTyJgA--SC-Q@mail.gmail.com>
In-Reply-To: <CAODtcdf-+QpPpB5R-hLkKWKacwM=N3=XRDs-tK60W9WzUJu7xw@mail.gmail.com>

Yes. But I'm keen to understand how to deal with a merge conflict.

My IDE is VSCode and when I run the merge I get this image:

https://imgur.com/a/vynTxaj

Which highlights this code:

255: <<<<<<< HEAD 256: samples = signal.convolve(samples, [1]*189, 'same')/189 257: 258: #for testing - log to file 259: #self.f.write(samples.astype(np.float32).tobytes()) 260: 261:======= 262: samples = signal.convolve(samples, [1] * 10, "same") / 189 263: 264: # for testing - log to file 265: # self.f.write(samples.astype(np.float32).tobytes()) 266: 267:>>>>>>> 1f893dc (Make project runnable on Linux)

Now I would assume that samples = .... from ln 256 abd 262 are the differences between MAIN and FEATURE?

But when I search main (at least I think its main - my IDE doesnt tell me mid rebase process) for ` samples = signal.convolve(samples, [1]*189, 'same')/189` AND `samples = signal.convolve(samples, [1] * 10, "same") / 189` - those lines do not exists anywhere in MAIN???

So what is going on????

Al