Skip to content

Commit 4ebdcc9

Browse files
chriscoolchriscool
committed
rn-5: add merge visualization support
1 parent dfae980 commit 4ebdcc9

1 file changed

Lines changed: 63 additions & 0 deletions

File tree

‎rev_news/drafts/edition-5.md‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,69 @@ suggestion into account.
7777

7878
### Support
7979

80+
* [Visualizing merge conflicts after the fact](http://thread.gmane.org/gmane.comp.version-control.git/271738)
81+
82+
Eric Raible reported the following:
83+
84+
> Upon returning from a vacation, I was looking at what people had been
85+
> up to, and discovered on merge in which a colleague had resolved a merge
86+
> incorrectly. It turns out that he has pushed *many* merges over the past
87+
> year which had conflicts in my code, and now I don't trust any of them.
88+
>
89+
> So naturally I want to check each of them for correctness.
90+
>
91+
> I know about "git log -p -cc SHA -- path", but it really doesn't
92+
> show just the conflicts so there's just too much noise in that output.
93+
>
94+
> I use kdiff3 to resolve conflicts, so I'm looking for a way to
95+
> visualize these already-resolved conflicts with that tool.
96+
97+
Johannes Schindelin, aka Dscho, suggested the following shell script
98+
to recreate the merge conflicts and then compare the resulting commit
99+
with the existing one:
100+
101+
```bash
102+
mergecommit=$1
103+
104+
# probably should verify that the working directory is clean, yadda yadda
105+
106+
# recreate merge conflicts on an unnamed branch (Git speak: detached HEAD)
107+
git checkout $mergecommit^
108+
git merge $mergecommit^2 ||
109+
die "This merge did not have any problem!"
110+
111+
# compare to the actual resolution as per the merge commit
112+
git diff $mergecommit
113+
```
114+
115+
Michael J Gruber replied to Dscho that, as we often get this type of
116+
request, it might be a good idea to better support the above.
117+
118+
Junio Hamano then pointed to
119+
[a patch series from last September by Thomas Rast](http://thread.gmane.org/gmane.comp.version-control.git/256591)
120+
that implements a new `--remerge-diff` option for `git log` to show
121+
what a conflict resolution changed. Unfotunately, though the feature
122+
looks promising at least to Michael, it looks like some more work is
123+
needed to properly integrate this feature into Git.
124+
125+
Dscho, when he originally replied to Eric, also suggested the
126+
following command to list all the merge commits created by one
127+
colleague in the current branch:
128+
129+
```bash
130+
git rev-list --author="My Colleague" --parents HEAD |
131+
sed -n 's/ .* .*//p'
132+
```
133+
134+
And Michael noticed that using the `--merges` option would be better
135+
than using `sed` to filter the merge commits. Something like the
136+
following could do it:
137+
138+
```bash
139+
git rev-list --author="My Colleague" --parents --merges HEAD
140+
```
141+
142+
80143
* [Several date related issues](http://thread.gmane.org/gmane.comp.version-control.git/272658)
81144

82145
Rigth now `git log` supports the following date related otions:

0 commit comments

Comments
 (0)