Hello, I think I did something wrong, but I'm not sure exactly what yet. I recently did a git sync from Plastic and it told me that I needed to merge with the changes from Git, even though I had not made any direct changes to the git repo (all changes were performed through Plastic). Here are the steps that I followed:
Machine A:
1. Created initial checkin along with a handful of other ones to main.
2. Synchronized all changes to my gitsync git repo.
Machine B:
3. Made a few more checkins to main through Plastic.
4. Synchronized all changes to my gitsync git repro.
After step 4, Plastic told me that my git repo had changed and that I need to merge. My branch explorer is attached and the red lines show changesets that are identical between the two (the bottom track was newly added by the git sync operation mentioned in step 4), but are somehow now needing to be merged.
My question is if this is expected behavior? Should I just merge those identical changesets in, or did I do something improperly when switching between machines? Any help would be appreciated!
Thank you,
Chad