Skip to main content
M
micmatt
Participating Frequently
January 5, 2018
Answered

Conflict resolution could not be completed

  • January 5, 2018
  • 6 replies
  • 5499 views

We are running an After Effects Team project and one team member cannot share their changes until all conflicts are resolved.

When opening the 'Resolve Conflicts' dialogue box, the conflict type is 'Team Project Settings' and they are only presented with 2/3 options:

  • Keep your version
  • Take The shared version
  • (Copy and rename your version, then take the shared version is greyed out)

We have tried both options and are continually presented with 'Conflict resolution could not be completed.'

We cannot share the changes until this is resolved. Does anyone have any ideas as to how we can resolve this?

Thanks in advance.

Note: We are on iMacs running macOS High Sierra with the latest versions of After Effects.

This topic has been closed for replies.
Correct answer PeterELee

We have been able to reproduce this bug in house, and we're working on a fix. I can't give you an ETA on when that will be available, unfortunately.

It appears that this bug is triggered when two collaborators on a Team Project both make changes to After Effects project settings, such as Bit Depth, Time Display Style, or Audio Sample Rate (I've only reproduced it with Bit Depth, but I assume it applies to anything in the Team Project Settings dialog). The first collaborator is able to share, but once the second collaborator gets those changes, they will be stuck in this situation.

micmatt​'s solution is the best one I know of at this point.

-Peter

6 replies

coolguy2020
coolguy2020
Inspiring
September 9, 2021

We had the same issue and we think it might have been caused by switching the time display style from timecode to frames by one of the users.

 

We managed to fix the issue by changing the version in the cloud to frames and then uploading the changes again by the person that had the "Conflict resolution could not be completed." alert.

    S
    Scott5E15
    Participant
    October 27, 2020

    This is absolutely not solved. And it's been over 2 years. micmatt has a work around, not a solution. As far as I can tell, and am currently experiencing, this bug is still raging. Any word on it being actually fixed at any point?

      S
      Sam5E1C
      Participant
      December 11, 2020

      Agreed, just had this error. We're not doing any major audio work in AE - just titles. 

      PeterELee
      Adobe Employee
      PeterELeeCorrect answer
      Adobe Employee
      January 30, 2018

      We have been able to reproduce this bug in house, and we're working on a fix. I can't give you an ETA on when that will be available, unfortunately.

      It appears that this bug is triggered when two collaborators on a Team Project both make changes to After Effects project settings, such as Bit Depth, Time Display Style, or Audio Sample Rate (I've only reproduced it with Bit Depth, but I assume it applies to anything in the Team Project Settings dialog). The first collaborator is able to share, but once the second collaborator gets those changes, they will be stuck in this situation.

      micmatt​'s solution is the best one I know of at this point.

      -Peter

      H
      hunz25
      Participant
      January 31, 2018

      Thanks PeterElee.

      We did a similar repro and noticed the same flow of problems.  After that we did have it randomly happen again which wasn't neat at all.

      Other observations;

      If someone opens a team project it doesn't initially bring over the team project settings.  It keeps the ones you have currently have.  We created a rule internally that EVERYONE had to set the project up to match the Team Project settings before hand.  If you do it afterwards it causes the problem at hand.

      Anyways, good luck with it all.  We do a lot of work with Gaming Companies and use Git and PlasticSCM and it's always such a complex thing.  Do you know if you'll have a mode that's a little more deeper in information? or is the plan to make this as simple as possible?

      Thank you!    

      PeterELee
      Adobe Employee
      PeterELee
      Adobe Employee
      January 8, 2018

      Can you have the user enable logging in After Effects and PM me the log? It may help isolate which setting is causing a conflict. You should be able to enable logging by choosing Help->Enable Logging, and you can find the log file by choosing Help->Reveal Logging File.

      To get the user unstuck, I would have them try going back to an earlier auto-save. You can do this in the Media Browser: browse to the Team Project that is currently open; choose the "Auto-Saves" tab; drag the slider on the right side to the version you want to restore to, then right-click the Team Project name and choose "Make Auto-Save ... the Latest". This will roll back some of their unshared edits, hopefully including the problematic setting.

      H
      hunz25
      Participant
      January 28, 2018

      Any word on if this was resolved? my team is having the same issues with a project.  Everything sync's just fine but the Team Project Settings refuses.

      M
      micmattAuthor
      Participating Frequently
      January 29, 2018

      I'm afraid the only way we could resolve this was to make the Team Project into an offline project, then import to a new Team Project.

      PeterELee
      Adobe Employee
      PeterELee
      Adobe Employee
      January 8, 2018

      Does this issue persist even if they choose "Stop Resolving," then quit After Effects, relaunch, then try resolving again?

      M
      micmattAuthor
      Participating Frequently
      January 8, 2018

      Hi Peter, yes it does. Any ideas?

      R
      Adobe Employee
      Ramesh_Encore
      Adobe Employee
      January 8, 2018

      Hi,

      Sorry for the issue you are facing while using Team Projects.

      To understand the issue better, could you please share a screen shot while this issue happens along with the "After Effects and Team Projects Local Hub" logs from /Users/<your_user_name>/Library/Preferences/Adobe

      Regards,

      Ramesh.

      M
      micmattAuthor
      Participating Frequently
      January 8, 2018

      No problem. Here they are for you. Thanks!

      Dropbox - AdobeLogs.zip

      Terms & ConditionsAccessibility statement
      Using the community Terms of use Privacy Cookie preferences Do not sell or share my personal information ad choicesAdChoices