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.

Sign up for GitHub

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

Jump to bottom

Improve entry merge dialog (3-way merge) #6190

Closed
3 tasks
tobiasdiez opened this issue Mar 27, 2020 · 12 comments
Closed
3 tasks

Improve entry merge dialog (3-way merge) #6190

tobiasdiez opened this issue Mar 27, 2020 · 12 comments
Assignees
@HoussemNasri
Labels
project: GSoC type: enhancement ui

Comments

@tobiasdiez
Copy link
Member

  • Add option to show only differences
  • Emphasize header (e.g. bold and with different background) as in
  • Concert to 3-way merge: the two entries to be merged on the left and right, in the mid the final merged entry. The values of the merged entry in the center should be editable (i.e. text fields). Similar to
@tobiasdiez tobiasdiez added the ui label Mar 27, 2020
@koppor
Copy link
Member

koppor commented Sep 2, 2020

Should also support to merge keywords and groups (see JabRef#12).

@JabRef JabRef deleted a comment from github-actions bot Mar 24, 2021
@Siedlerchr
Copy link
Member

Request fromt he forum: Should support merging of files. E.g. when I merge two entries with files attached create one entry with both files.

@koppor koppor mentioned this issue Jun 16, 2021
Closed
@koppor
Copy link
Member

koppor commented Jul 14, 2021

Current state: https://docs.jabref.org/finding-sorting-and-cleaning-entries/mergeentries

The main issue is that we do not show the result in the dialog

grafik

@koppor
Copy link
Member

koppor commented Jul 14, 2021

When working on that, one could also solve #2961 (see especially #2961 (comment)).

@Siedlerchr Siedlerchr mentioned this issue Jul 20, 2021
Merged
5 tasks
@koppor koppor mentioned this issue Sep 22, 2021
Closed
@calixtus
Copy link
Member

Something similar to here #7929

@koppor
Copy link
Member

koppor commented Mar 28, 2022

The code bases can be https://github.com/iazarny/gitember. Deep link: https://github.com/iazarny/gitember/blob/master/src/main/java/com/az/gitember/controller/MergeDialog.java

Note that we MUST NOT copy and paste the code, because their license is Apache 2.0, whereas our license is MIT. The code cannot be relicensed without agreement from the original authors (which we don't have).

@Rifat951
Copy link
Contributor

Hello Team,
we are group of 5 people(@Beingmani , @yogeshvar, @Rifat951, @LIM0000, @tirthvyas-tk-labs) from University of Adelaide.We are new to this community and want to start contributing to jabref. Therefore, would like to work on this specific issue. Is there any prerequisite before we start working on this issue ?

@Siedlerchr Siedlerchr mentioned this issue Mar 31, 2022
Open
@calixtus
Copy link
Member

calixtus commented Apr 3, 2022

Thank you for your interest in JabRef. Be aware that this issue is is a large GSoC proposal for about 175 dedicated estimated work hours and is no beginner project. You definitely need good knowledge of java and some decent knowledge of javafx for this issue.
I really would advise you to start with a good first issue to get familiar with the jabref code base before taking this project.
Please also read the developer documentation about preparing your workspace and checkstyle to avoid unnecessary setbacks during the review process of your code changes. A good practice is also to make an early wip draft pull request so we can follow your changes and tell early if we thinks it's going in the wrong direction.
Feel free to use our Gitter chat for questions and have fun coding.

@Siedlerchr
Copy link
Member

This should also fix #8745

@claell
Copy link
Contributor

claell commented May 1, 2022

@Siedlerchr not sure, as #8745 is not about the user, but about the import logic, as far as I can see.

@ThiloteE ThiloteE mentioned this issue May 3, 2022
Open
2 tasks
@koppor koppor moved this from Reserved to In Progress in Candidates for University Projects Jun 25, 2022
@ThiloteE ThiloteE moved this from In Progress to Reserved in Candidates for University Projects Jun 25, 2022
This was referenced Jun 30, 2022
Closed
Open
Closed
@HoussemNasri HoussemNasri mentioned this issue Jul 6, 2022
Open
2 tasks
This was referenced Jul 12, 2022
Closed
Merged
@ThiloteE ThiloteE moved this from Reserved to In Progress in Candidates for University Projects Jul 12, 2022
@HoussemNasri HoussemNasri mentioned this issue Jul 25, 2022
Closed
@HoussemNasri HoussemNasri mentioned this issue Aug 2, 2022
Merged
6 tasks
This was referenced Aug 3, 2022
Merged
Merged
This was referenced Aug 13, 2022
Open
Closed
Closed
koppor pushed a commit that referenced this issue Sep 1, 2022
Squashed 'buildres/csl/csl-styles/' changes from c750b6e..8d69f16
c15cec8 
8d69f16 Create university-of-hull-harvard.csl (#6146)
139dfdd Create current organic synthesis.csl (#6139)
bb006c8 Update acta-universitatis-agriculturae-sueciae.csl (#6143)
5815da0 Create food-science-and-biotechnology.csl (#6132)
2702a7c Update harvard-university-for-the-creative-arts.csl (#6104)
ef34543 Update economic-geology.csl (#6128)
0adcd30 Bump mathieudutour/github-tag-action from 5.6 to 6.0 (#6141)
3c36e97 Create universite-du-quebec-a-montreal-prenoms.csl (#6073)
415bc05 Bump softprops/action-gh-release from 0.1.14 to 1 (#6142)
ae8c5e4 Create politique-europeenne.csl (#6074)
09cbc09 Update cell-numeric-superscript.csl (#6188)
6ee1ace Update avian-conservation-and-ecology.csl (#6191)
cb5c43f Update harvard-anglia-ruskin-university.csl (#6189)
5c4f4c0 Create anais-da-academia-brasileira-de-ciencias.csl (#6066)
a60dfe9 Update cardiff-university-harvard.csl (#6190)
999a45c Create sociologia-urbana-e-rurale.csl (#6042)
1bc9d62 Bluebook (#6183)
a4f2a72 Oxford Brookes (#6182)
88df8d5 Delete harvard-cardiff-university-old.csl (#6180)
b9302fd Update APA styles for "event" macro (#6174)
d4daec6 remove DOI for printed articles organizational-studies.csl (#6176)
acfc620 Create liver-transplantation.csl (#6167)
129a775 Change "event" to "event-title" (#6164)

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: 8d69f16
@Siedlerchr
Copy link
Member

@HoussemNasri Just stumbled across this issue? I think we can close this?

@HoussemNasri
Copy link
Member

https://github.com/JabRef/jabref/wiki/GSoC-2022-%E2%80%94-Implement-a-Three-Way-Merge-UI-for-merging-BibTeX-entries

Repository owner moved this from In Progress to Done in Candidates for University Projects Oct 7, 2022
@koppor koppor moved this to Closed in JabRef UI Improvements Nov 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@HoussemNasri HoussemNasri

Labels
project: GSoC type: enhancement ui
Projects
Candidates for University Projects
Archived in project
Features & Enhancements
Archived in project
JabRef UI Improvements
Archived in project
Milestone
No milestone
Development

No branches or pull requests
7 participants
@Siedlerchr @koppor @tobiasdiez @claell @HoussemNasri @Rifat951 @calixtus