Search Unity

Question Plastic File Resolve Conflicts

Discussion in 'Unity Version Control' started by pKallv, Oct 12, 2022.

  1. pKallv

    pKallv

    Joined:
    Mar 2, 2014
    Posts:
    1,191
    Is it only me? ...but Plastic have never been able to resolve file conflicts for me!
     
    pKallv, Oct 12, 2022
    #1

  2. ollieblanks

    ollieblanks

    Unity Technologies

    Joined:
    Aug 21, 2017
    Posts:
    460
    Hey @pKallv, can you give us an example? What is the unexpected behaviour you are seeing?
     
    ollieblanks, Oct 13, 2022
    #2

  3. pKallv

    pKallv

    Joined:
    Mar 2, 2014
    Posts:
    1,191
    I will do next time I have the problem, which could be soon.
     
    pKallv, Oct 14, 2022
    #3
    ollieblanks likes this.

  4. pKallv

    pKallv

    Joined:
    Mar 2, 2014
    Posts:
    1,191
    OK here is the problem I have!


    Screenshot 2022-11-01 at 10.49.58.png Screenshot 2022-11-01 at 10.49.26.png
     
    pKallv, Nov 1, 2022
    #4

  5. pKallv

    pKallv

    Joined:
    Mar 2, 2014
    Posts:
    1,191
    pKallv, Nov 1, 2022
    #5

  6. pKallv

    pKallv

    Joined:
    Mar 2, 2014
    Posts:
    1,191
    I still have problem after restoring last backup:

    Screenshot 2022-11-01 at 10.54.47.png Screenshot 2022-11-01 at 10.54.58.png Screenshot 2022-11-01 at 10.55.12.png
     
    pKallv, Nov 1, 2022
    #6

  7. carlosalba1985

    carlosalba1985

    Unity Technologies

    Joined:
    Jul 19, 2021
    Posts:
    1,075
    Hi,

    What is your OS? Is it Windows?

    Regards,
    Carlos.
     
    carlosalba1985, Nov 2, 2022
    #7

  8. pKallv

    pKallv

    Joined:
    Mar 2, 2014
    Posts:
    1,191
    Mac Monterey
     
    pKallv, Nov 2, 2022
    #8