conflict

When you resolve a conflict, then stage the changes, then do a git diff, it shows you two columns of +'s and -'s, one for "ours" and one for "theirs". Given a merge commit in a repo's git history, how do I see that resolution, which was done by someone else? In other instances, I've seen it before (in gitk, I think), but I can't seem to determine it for this SHA1 that I have. micromoses If you know the ref, then git show <MERGE_COMMIT> will show you the resolution done (if any) for the merge commit. For log, use git log -p -c or git log -p --cc . From the manpage of git log: -c With this

Is there a way to resolve conflict for all files using checkout --ours and --theirs ? I know that you can do it for individual files but couldn't find a way to do it for all. Just grep through the working directory and send the output through the xargs command: grep -lr '<<<<<<<' . | xargs git checkout --ours or grep -lr '<<<<<<<' . | xargs git checkout --theirs How this works: grep will search through every file in the current directory (the . ) and subdirectories recursively (the -r flag) looking for conflict markers (the string '<<<<<<<') the -l or --files-with-matches flag causes grep to

I have an AJAX action and trying to use Highchart at the same time that's why I need Prototype to be included. Here is my code but is not showing the Highchart graph: <script src="https://ajax.googleapis.com/ajax/libs/prototype/1.7/prototype.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script> <script src="http://code.highcharts.com/highcharts.js"></script> <div id="contain" style="min-width: 310px; height: 400px; margin: 0 auto"></div> Here is the information: http://jsfiddle.net/dhdSL/4/ Of course is working 100% without Prototype: http:/

I am using Git and when I tried to pull a newer development branch with my current branch using XCode's source control menu I received this error message: The operation could not be performed because "ProjectName" has one or more tree conflicts. How do I resolve these tree conflicts? Thanks GayleDDS There is a conflict in the project file you need to pull using the command line or a GUI tool like SourceTree (Free) and manually resolve the conflict in a text editor or diff tool. See also: How to use Git properly with XCode? I was in trouble with this problem. It often happens when I remove or

In my java project, I need to use neo4j-1.9.3 that depends on lucene-3.6.2 , and ElasticSearch which depends on lucene-4.4.0 . I know that if I want to use two versions of lucene directly, I can use ClassLoader to load different classes from the lucenes. But the problem is that I won't use lucene's apis directly now. Is there any way that lucene-3.6.2 can be loaded when neo4j's apis are running, and lucene-4.4.0 can be loaded while running elasticsearch's apis. The two versions of lucene conflict now, and I need to run neo4j and elasticsearch in one project. How could I solve the dependency