It's the thing you use to create a local copy of the main code base, and then merge your changes back in.
OP hasn't done anything, and there's 7 conflicts between his code and main. Presumably because someone else merged their changes in the time between when OP pulled his local copy and tried to push his (non-existent) changes.
It's the thing you use to create a local copy of the main code base, and then merge your changes back in.
OP hasn't done anything, and there's 7 conflicts between his code and main. Presumably because someone else merged their changes in the time between when OP pulled his local copy and tried to push his (non-existent) changes.