I have this in my files after some trouble with VS2012 git-plugin:
using Microsoft.VisualStudio.TestTools.UnitTesting;
<<<<<<< HEAD
using NHibernate;
=======
>>>>>>> dd2c3d7dfe81074e7c5a73f8e4ca2584481a74f1
namespace Controll.Hosting.Tests
{
[TestClass]
public class TestBase
{
<<<<<<< HEAD
protected ISessionFactory SessionFactory;
[TestInitialize]
public void InitializeTestBase()
{
SessionFactory = NHibernateHelper.GetSessionFactoryForMockedData();
=======
[ClassInitialize]
public void InitializeTest()
{
Console.WriteLine("Settings NHibernateHelper.IsInTesting -> True");
NHibernateHelper.IsInTesting = true;
>>>>>>> dd2c3d7dfe81074e7c5a73f8e4ca2584481a74f1
}
}
}
How can i reset my files?
Using SourceTree for git to manage my builds with Kdiff installed has helped me resolve 99% of these issues really efficiently.
I'm just left with trying to remove these from my SOU file in .Net, usually replacing the SOU file with an older version resolves this.
Your Q is answered best by alestanis, already. Still for easy lookup:
An explanation of those conflict markers
>>>>>
...<<<<<
can be found at this question.There's more info about merging at this Q.
And
git help merge
is quite explicitly helpful as well:What you had wasn't trouble but conflicts. This happens when the files are modified by two different persons at the same place (you both add/remove/modify things inside the same lines).
You can simply update your files manually, by deciding to keep everything between
<<<<<<< HEAD
and=======
, or between=======
and>>>>>>>
, or some mix of the two. Once you resolve all your conflicts, you just need to commit your changes.To discard local changes on a file, you can do
or, for all files using
You can also decide, for each file, if you want to keep your version or the repository version with