search

localcc / gvas

GVAS file format parsing library for rust
MIT License
20 stars 2 forks source link

read_enum, write_enum #80

Closed scottanderson closed 7 months ago

localcc commented 7 months ago

merge conflicts

localcc commented 7 months ago

conflicts again 😭

scottanderson commented 7 months ago

I only see conflicts if I select the rebase strategy. I recommend using the squash strategy instead, because rebase will re-introduce conflicts that were previously resolved in a merge commit.