View already-committed Git merge in external 3-way diff tool -

-

is there way view merge has been committed in 3-way diff?

if huge merge between branches committed 3 weeks ago, there way can see 3-way diff of in external diff-tool beyondcompare3? i'm looking just files changed in merge commit. bonus if show me conflicts , manually changed, opposed seeing entire difference of file between 2 branches.

i wouldn't mind settling 2-way diff if left side had <<<<< ===== >>>>> conflict markers , right side committed result.

i tried looking @ diff-tree, diff-files, diff, difftool, show, , others , couldn't figure out. know gitk show changes in merge commit not over-under diff view , hard understand when there tons of changes.

if git difftool --cc firstparent..secondparent..result

updated answer: original version of script below flawed in sense $conflicting_files in fact did not contain files had conflicts, files changed in both parent branches (but not had conflicts). also, not using "the configured merge tool" advertized in rationale, diffuse. i've addressed both issues in current version of script.

original answer: let's have "master" branch main development going on, , "topic" branch adds feature on top of (older) state of master. saying you're looking files changed in merge commit assume you're interested in changes "topic" introduced "master" in merge commit (including conflict resolution), not in non-conflicting changes done in "master" since "topic" branched. further assuming "master" first parent of merge commit , "topic" second, can achieved with

git difftool <merge commit>^1 <merge commit>

note not make sense use 3-way diff here looking @ state includes conflict resolution. github showing merge commits, way, see e.g. this merge commit have used testing.

to see conflicting files , resolutions in 3-way diff tool came script

#!/bin/sh  if [ $# -ne 1 ];     echo "rationale : show conflict resolution of given merge commit in configured merge tool."     echo "usage : $(basename $0) <merge commit>"     exit -1 fi  # test e.g. https://github.com/git/git/commit/8cde60210dd01f23d89d9eb8b6f08fb9ef3a11b8 our=$1^1 their=$1^2 base=$(git merge-base $our $their)  conflicting_files=$(git merge-tree $base $our $their | grep -a 3 "changed in both" | grep "base" | grep -po "[^\s]+$") f in $conflicting_files;     diffuse -r $our -r $base -r $their $f done

i'm using diffuse instead of beyond compare because first can work directly on git commits opposed local files; change order of arguments liking. use bc, need temporary checkouts; thinking redoing merge, applying known resolution, , run ever git mergetool configured, both of these ideas require more work not clutter working tree , clean properly.


Comments

Post a Comment

Popular posts from this blog

django - How can I change user group without delete record -

-
on website user have 1 group. , user can change group. it's made user.groups.clear() and user.groups.add(new_group) but it's not efficient, because there 2 sql query: delete, insert. how can change group update query? user , group related each other using manytomanyfield . means intersection table exists relating both entities, , if don't specify model map (using through attribute) django creates 1 you. looking @ sources django.contrib.auth.models see that's case. fortunatly, can access intermediary model using through attribute of manager (in case, user.groups.through ). can use regular model. example: >>> alice = user.objects.create_user('alice', 'alice@example.com', 'alicepw') >>> employee = group.objects.create(name='employee') >>> manager = group.objects.create(name='manager') >>> alice.groups.add(employee) >>> alice.groups.all() [<group: employee...
Read more

java - Need to add SOAP security token -

-
i need set custom soap header attribute on jax-ws generated webservice client. case webservice calls must go through proxy server requiring specific token (recieved web request header) present in soap request header. e.g.: 1 carserviceservice service = null; 2 service = new carserviceservice(new url(url), new qname(qname); 3 carserviceendpoint port = service.getcarserviceport(); it seems in line 3 wsdl retrieved , call fails due missing security token. 1 point direction on how done? a detailed example has been mentioned here: creating , deploying jax-ws web service on tomcat 6 this article shows how create , use security token .
Read more

java - EclipseLink JPA Object is not a known entity type -

-
i have strange problem eclipselink , object want persist. have 1 object (keypointlistimpl) stores object keypointimpl in list. persisting keypointimpl objects works great if try persist keypointlistimpl object java.lang.illegalargumentexception says object keypointimpl isn't known entity type. here keypointimpl code: @entity @table(name="keypoints") public class keypointimpl implements keypoint { @id @generatedvalue(strategy = generationtype.identity) private int id; @enumerated(enumtype.string) private detectortype keypointtype; private float x; private float y; private float size; private float angle; private float response; private int octave; private int classid; ... } here keypointlistimpl code: @entity @table(name="keypointlists") public class keypointlistimpl implements keypointlist { @id @generatedvalue(strategy = generationtype.identity) private int id; @onetoone(cascade={ca...
Read more