nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Help tips for errors

monkeypunch

I'm using SourceTree for a project and it is driving crazy when I get an error. I don't know what to do. Could you consider putting a suggested fix type of thing for when this happens? Maybe a video or link to a tutorial based on the error.

For example, I'm getting this error:

I want to know what to do in SourceTree when this happens.

Accepted answers

All comments

Seth

There is a suggested fix. It is right there in red. You started a merge, but did not commit it, and now you are trying to pull.

Have you read the Git book? I suggest sections 1.1, 1.3, and chapters 2 and 3. Once you have a better understanding of what Git is doing, the error messages will make more sense and you will have a better idea of what to expect when you hit any button in SourceTree.

monkeypunch

I have to use git for work. I've read that before. Some of the error messages are much less descriptive. Also, the process for merging is multistep. The error messages don't always cover how to resolve it IMHO. Also, I edited my feelings from the post. That doesn't need to be there I think.

Seth

Thanks, I'll edit mine as well.

There is a very good reason that error messages don't tell you how to resolve merges - they don't know. Usually what happens when there is a conflict is that the same line of code has been changed on two different branches in two different ways. The software cannot know which is right (or if there is a way to do both together), it takes a programmer to read the code and resolve the conflict.

Also, when you say error messages are "less descriptive", what are you comparing to? I've used a few other version control systems (CVS, SVN), and generally find Git's messages to be as or more descriptive.

Seth

Also, what tool do you use for merging? I'd try to find a merge tool that makes the process more transparent (even if you have to pay for it), and configure SourceTree to use that.

Make sure the tool supports 3-way merge (WinMerge, for example, does not. It only shows a 2-way diff). A 3-way merge shows you 3 versions of your file 1) before the branches split 2) your branch 3) the branch you are merging. You might try Meld.