-
Notifications
You must be signed in to change notification settings - Fork 38
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
PSA: The large reformat #240
Labels
📢 PSA
An announcement about upcoming changes
Comments
There seems to be some problems developing on Windows now, after the reformat/workflow change:
I'll be looking into fixing these issues, but I just thought I would let anyone else having these issues know. Took me a while to figure out what was wrong. |
|
I think I was able to fix both issues here: #242 |
ianshade
pushed a commit
to ianshade/tv-automation-server-core
that referenced
this issue
Jun 9, 2023
Sof 1417/list of schema has duplicates
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
As we planned to do many months ago, this repository has now been reformatted using prettier.
This can cause large and painful merge conflicts in pull requests unless handled carefully. This issue aims to outline advice and steps to mitigate any pain that may be felt because of this.
Process for a painless merge
The best process for handling this, is to merge the formatted branch into yours.
Firstly, you need to identify the 2 important commits from the branch you want to merge in. These are the commit just before the merge, and the commit of the merge. To identify these, look in the git history for the merge commit adding the prettier config, and a merge commit soon after which applies this formatting. Github does not make the correct commits very clear, some desktop tools show it a lot better.
For the release21 branch, these are 4864ff5 and 6314c74.
For the master branch, these are d7a403c and 16cf61d.
Note: the remaining steps will assume you are working with master, and will use the commit ids as shown above
checkout your branch to update
Pull in any changes
git merge d7a403c6
IMPORTANT: any merge conflicts need to be committed with
git commit --no-verify
to avoid premature formatting of the changesIf you are on windows, you will need to cherry-pick in 761f927 and d36db2a to get the scripts to work properly
Pull in the format change
git merge 16cf61da
Discard any changes, and delete any 'new' files
meteor npm run quickformat
meteor npm run lint -- --fix
Note: Ensure no errors are reported by this. any which are need to be fixed before continuing
Commit all changed files. This should be done as a normal commit again, and will verify the lint is ok
Pull in any newer changes
git merge master
The text was updated successfully, but these errors were encountered: