Skip to content
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

Fix Invalid Bibtexkey freeze #1893

Merged
merged 6 commits into from
Aug 31, 2016
Merged

Fix Invalid Bibtexkey freeze #1893

merged 6 commits into from
Aug 31, 2016

Conversation

grimes2
Copy link
Contributor

@grimes2 grimes2 commented Aug 30, 2016

Fixes #1882. Reference: #1863.

  • Change in CHANGELOG.md described
  • Manually tested changed features in running JabRef

@grimes2
Copy link
Contributor Author

grimes2 commented Aug 30, 2016

Please add label "ready-for-review". Thanks.

@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Aug 30, 2016
@grimes2 grimes2 changed the title Invalid Bibtexkey freeze Fix Invalid Bibtexkey freeze Aug 30, 2016
@Siedlerchr
Copy link
Member

Siedlerchr commented Aug 31, 2016

LGTM 👍 I tested your changes and they are working. Good work!
Please resolve the merge conflicts and then we can merge it it.

To resolve the merge conflicts I recommend installing and setting up a merge tool for 3way merge (e.g. Meld or kdiff3 or your favorite tool)
Then you do
git checkout master
git fetch upstream
git merge upstream/master
git push
git merge upstream/<yourBranch>
Open Git Gui to see and resolve merge conflicts
Be careful with the changelog,

@Siedlerchr Siedlerchr merged commit 863bf22 into JabRef:master Aug 31, 2016
@Siedlerchr
Copy link
Member

Well done 👍 Merged.

@grimes2 grimes2 deleted the invalidbibtexfreeze branch August 31, 2016 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants