I have a css file 'A' on which I did

Question

I have a css file 'A' on which I did

some changes and saved to a file 'B'. I also made an automated script to do some automated conversions from 'A' and saved to a file 'C'. Now I want to merge whatever changes done between 'B' and 'C' where 'B' takes priority in case of conflicts.
I have mostly changed colors from 'A' to 'C' while there are a lot more style changes from 'A' to 'B'.

I could use git diff but it feels a bit manual. What would be an easier tool to do this? Or maybe diff itself if there's something automation I can learn from.

0

15.05.2022

4 ответов

20 просмотров

Priyanshu Rai Автор вопроса

Sharuzzaman Ahmat Raslan
Merging require human to make decision which part ...

Manual changes would be really error prone here. If there's a way to somehow mark whatever changes were done from A to B and then write those changes in C.

0

15.05.2022

Sharuzzaman Ahmat Raslan

What do you mean manual change? You diff A and B, write it to a file. Then merge that file to C.

0

15.05.2022

Priyanshu Rai Автор вопроса

Sharuzzaman Ahmat Raslan
What do you mean manual change? You diff A and B, ...

I did a diff3 and was able to resolve conflicts easier than before. Thanks a lot anyways.

0

15.05.2022