mistercrunch commented on PR #29586:
URL: https://github.com/apache/superset/pull/29586#issuecomment-2267158558
For easier merge you may want to run
`./scripts/translations/babel_update.sh` prior to rebasing. Recently I added
`--no-location` which should facilitate much easier merge as the `.po` files
are now stripped of references which used to make merging/rebasing really
difficult.
So
```
./scripts/translations/babel_update.sh
git pull --rebase {your_main_fork_remote} master
```
Hopefully things go smoothly.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
