Home/ Questions/Q 6193295
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-24T03:05:39+00:00

Here’s an example: private void btnUndo_Click(object sender, EventArgs e) { <<<<<<< .mine ======= The

  • 0

Here’s an example:

    private void btnUndo_Click(object sender, EventArgs e)
    {
<<<<<<< .mine
=======

The third and fourth line are being added to other developers machines when they do an update with from my commit. I’m using SVN.

What is being added here?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    You/Somebody had a conflict on the update/commit and you didn’t resolve it before checking in.

    The <<<<< and ===== is there to show you what part of the source code is conflicting, and you need to resolve those before you actually commit — the commit may even have warned you about it, and you may have confirmed to SVN that it was resolved.

    • 0