Hi I followed the lecture, but somehow I didn’t get the conflicting error and the 2 branches merged.
my new duplicated and renamed scene has now got the changes I did.
however the first renamed scene now has got both changes, very weird.
Do you know what could be the issue?
thanks in advance
Best regards
Tommy
There are circumstances where even changes to the same file do not result in a merge conflict.
Git doesn’t actually compare entire files and determine there’s a problem, instead it breaks them down into “hunks”. So long as the hunks in both sides of the file don’t result in a conflict, it may just go ahead and merge.
Depending on what you wanted to do, that may be a lucky result, or may not be what you wanted.
In any case, just for the sake of this lesson, I think if you mess with your scenes and objects a little more before trying to do a merge, you’ll have a greater chance of a conflict occurring so you can try it out.
This topic was automatically closed 24 hours after the last reply. New replies are no longer allowed.