Updating TC queries

[Hobbesball]

With some balmy summer feedback from Collections Engagement colleagues, here's some more updates to our TC queries. Ideally these queries would be merged around end of August.

🏖☀🏖☀🏖☀🏖☀🏖☀🏖☀

[marrerom]

Planned for 2nd Sept

…

On Thu, 13 Aug 2020 at 14:28, Jolan Wuyts ***@***.***> wrote: With some balmy summer feedback from Collections Engagement colleagues, here's some more updates to our TC queries. Ideally these queries would be merged around end of August. 🏖☀🏖☀🏖☀🏖☀🏖☀🏖☀ ------------------------------ You can view, comment on, or merge this pull request online at: #30 Commit Summary - removed industrial heritage UGC from natural history and sport - Merge remote-tracking branch 'upstream/master' - updated with swedish keywords + entities - fixed sport and maps query aliases - removed Jamtli from art providers - Merge remote-tracking branch 'upstream/master' - removed Jamtli provider from art collection - Merge remote-tracking branch 'upstream/master' - added data provider to be included in Sports TC - remove biodiversity heritage library from Art TC - added key Swedish keyword to Sport query - Merge branch 'master' of https://github.com/europeana/search - added sports TC keyword - Merge branch 'master' of https://github.com/Hobbesball/search - updating art and natural history TC queries - fixing art TC - query TC update - Merge branch 'master' into master - Merge branch 'master' of https://github.com/europeana/search - Merge branch 'master' of https://github.com/europeana/search - updated multiple TC queries: remove fashion, Realienkunde, add Belvedere to art File Changes - *M* solr_confs/metadata/conf/query_aliases.xml <https://github.com/europeana/search/pull/30/files#diff-1bcd12ace741a14c1bf2434b6eef734e> (12) Patch Links: - https://github.com/europeana/search/pull/30.patch - https://github.com/europeana/search/pull/30.diff — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <#30>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AG6F3A76MG27ZCRLPCSYCKDSAPMAFANCNFSM4P6KYKSQ> .

-- *Mónica Marrero * | Search Specialist *E: *monica.marrero@europeana.eu | Skype: monica.marrero *Availability:* Tuesday, Wednesday, Thursday and Friday *We continue to work from home until 1 September 2020. You can read more about how we are doing that here <https://pro.europeana.eu/post/europeana-foundation-working-with-you-in-the-time-of-coronavirus>.* Be part of Europe's online cultural movement - join the Europeana Network Association: Sign up for the Association <https://pro.europeana.eu/network-association/sign-up> | #AllezCulture | @Europeanaeu <https://twitter.com/Europeanaeu> | Europeana Pro website <https://pro.europeana.eu/>

-- Disclaimer: This email and any files transmitted with it are confidential and intended solely for the use of the individual or entity to whom they are addressed. If you have received this email in error please notify the system manager. If you are not the named addressee you should not disseminate, distribute or copy this email. Please notify the sender immediately by email if you have received this email by mistake and delete this email from your system.

[adamu]

@Hobbesball Hello, here from your StackOverflow comment. The reason the rebase didn't work here is because this repo is squashing all the PRs. So what is happening is:

Your fork and PR:

• Commit a
• Commit b
• Commit c

Upstream merges your PR:

• Commit d (which contains all the changes from a, b, and c).

Then next time you make a PR, you carry on from your fork. But because upstream contains commit d, and none of your commits a, b, or c, the commits are effectively all resubmitted (even though they don't produce a diff, because d contained the same changes and you merged that into your branch).

You can fix it by resetting your master branch before starting a new PR, for example by doing something like git checkout -B master upstream/master.