diff --git a/app/models/CocoModel.coffee b/app/models/CocoModel.coffee index 8091035d8..ff601bcb5 100644 --- a/app/models/CocoModel.coffee +++ b/app/models/CocoModel.coffee @@ -64,7 +64,7 @@ class CocoModel extends Backbone.Model set: (attributes, options) -> delete @attributesWithDefaults inFlux = @loading or not @loaded - @markToRevert() unless inFlux or @_revertAttributes or @project or options?.silent + @markToRevert() unless inFlux or @_revertAttributes or @project or options?.fromMerge res = super attributes, options @saveBackup() if @saveBackups and (not inFlux) and @hasLocalChanges() res