CODEWITHSUNDEEP
sorbet
Atav32
Atav32

Reputation: 1812

How should I resolve merge conflicts in autogenerated RBI files?

It seems like some of the merge conflicts are even in an errors.txt file...

Is it ok to just delete all the autogenerated files and then regenerate them?

Upvotes: 1

Views: 66

Answers (1)

Connor Shea
Connor Shea

Reputation: 870

Yep! You can (and should) delete the autogenerated files and then regenerate them. You could manually resolve the conflicts, but that's error-prone and could cause weird issues if you mess anything up.

Upvotes: 1

Related Questions