Skip to content

Fix _versions.yml merge collisions#299

Merged
mishig25 merged 1 commit into
mainfrom
fix_versions_yml_collision
Sep 20, 2022
Merged

Fix _versions.yml merge collisions#299
mishig25 merged 1 commit into
mainfrom
fix_versions_yml_collision

Conversation

@mishig25

@mishig25 mishig25 commented Sep 20, 2022

Copy link
Copy Markdown
Contributor

Closes #292

What was going on:

  1. This commit increments the version as transformers v.4.22 in _versions.yml
  2. But afterwards immediately, this commit removes v4.22 from _versions.yml when transformers.version changes back to dev mode

The explanation is that step2 had "old" _version.yml file before step1 finished committing the "new" _versions.yml

As a solution, we will not commit changes to _versions.yml when the branch is main

cc: @sgugger @LysandreJik

@mishig25 mishig25 merged commit da021d6 into main Sep 20, 2022
@mishig25 mishig25 deleted the fix_versions_yml_collision branch September 20, 2022 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Optimum _version.yml file was not incremented automaitcally

1 participant