Fix 6488 #6535
Closed
Fix 6488 #6535
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi @WangAooa , I believe you happen to have some problems with git. I see you probably accidentally added your fix on top of your branch fixing MainTableColumnFactory. If I understand Git right, you should be able to create a new branch for your second PR, cherrypick the commits, which you want to have for the second PR and rebase it on upstream/master. For your first PR you can then safely reset your other branch to your last commit which belongs to the other PR. |
koppor
pushed a commit
that referenced
this pull request
May 15, 2023
e8e06888fe Update harvard-university-of-the-west-of-england.csl (#6520) dbbe5c1a95 Update united-states-international-trade-commission.csl (#6535) b985431f03 Update american-society-for-horticultural-science.csl (#6543) e1ff9f5546 Sort APA and derivatives on displayed date, not full date (#6545) 7302832d6d Localize original-work-published in APA (#6388) 77a61c0d82 Update united-states-international-trade-commission.csl (#6526) 541807a057 Update the-accounting-review.csl (#6521) 708626357a Update united-states-international-trade-commission git-subtree-dir: buildres/csl/csl-styles git-subtree-split: e8e06888fe388e81e3fa9052573732a791e8025e
koppor
pushed a commit
that referenced
this pull request
Jun 1, 2023
6b7fdff8cb Create journal-of-the-american-philosophical-association.csl (#6542) 9bae9efc55 Update german-council-of-economic-experts.csl (#6562) 256250be9c Update springer-vancouver-brackets.csl (#6546) f422ca9c9a Update turabian-fullnote-bibliography.csl (#6540) 2833b5d5d5 Update mots.csl (#6556) 44758704b0 Update and rename harvard-the-university-of-melbourne.csl to dependen… (#6547) 08e65fc8e1 Update ieee-with-url.csl (#6514) 06e98f4387 Fix erroneous comma in ACL in-text citation (#6553) 72e16a19cd Update bibliothek-forschung-und-praxis.csl (#6527) 50bae82394 Create Food and Agriculture Organization of the United Nations (numeric) (#6544) 234a3c35d8 Update bern-university-of-applied-sciences-school-of-agricultural-for… (#6552) 3e9e2d6e93 Fix et al and name settings in universitat bern institut fur sozialanthropologie (#6554) e8e06888fe Update harvard-university-of-the-west-of-england.csl (#6520) dbbe5c1a95 Update united-states-international-trade-commission.csl (#6535) b985431f03 Update american-society-for-horticultural-science.csl (#6543) e1ff9f5546 Sort APA and derivatives on displayed date, not full date (#6545) 7302832d6d Localize original-work-published in APA (#6388) 77a61c0d82 Update united-states-international-trade-commission.csl (#6526) 541807a057 Update the-accounting-review.csl (#6521) 708626357a Update united-states-international-trade-commission git-subtree-dir: buildres/csl/csl-styles git-subtree-split: 6b7fdff8cb0fb45b342e8ac319634bf18168c73d
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi, in order to let duplicate information clear, I have made some changes.
When we import new entries into a database.
(1) If these entries is duplicate to the entry in the database, it will show the Bibtexkey of the duplicate entry in UI.
(2) If there are two duplicate entries among the list of imported entries, it will show the title of the duplicate entry.