After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 483358 - Diffs
Diffs
Status: RESOLVED DUPLICATE of bug 552273
Product: tomboy
Classification: Applications
Component: General
unspecified
Other All
: Normal enhancement
: ---
Assigned To: Tomboy Maintainers
Tomboy Maintainers
Depends on:
Blocks:
 
 
Reported: 2007-10-04 13:41 UTC by EconomysizeGeek
Modified: 2011-06-25 15:51 UTC
See Also:
GNOME target: ---
GNOME version: 2.7/2.8


Description EconomysizeGeek 2007-10-04 13:41:52 UTC 
Would you consider adding merged diffs as an option for conflict resolution. I know that some users would hate that and prefer your current system where it creates new notes. 

I end up editing notes in a lot of different places and it would be way easier to handle merged diffs in the note than have to figure out what is different between two notes.

Other information:
Comment 1 Sandy Armstrong 2007-10-04 13:50:08 UTC 
Currently, I doubt we would do this.  This cycle I will be focusing on making sync happen automatically in the background, which will really help to cut back on the occurrence of conflicts.  Merging is a foreign concept to most non-developers, and we'd really like to keep Tomboy sync as simple as possible.

I'm leaving this open, though, as I wouldn't be opposed to opening conflict resolution up to add-in developers, for example.  Perhaps in the future it would be possible to have different conflict resolution handlers available to advanced users?
Comment 2 Boyd Timothy 2008-02-26 19:16:57 UTC 
Setting the default assignee and QA Contact to "tomboy-maint@gnome.bugs".
Comment 3 Robert Nordan 2011-06-25 15:50:17 UTC 
This is a duplicate of bug #552273.
Comment 4 Jared Jennings 2011-06-25 15:51:18 UTC 

*** This bug has been marked as a duplicate of bug 552273 ***