Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1bf8707a
Commit
1bf8707a
authored
Apr 16, 2020
by
Marcia Ramos
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jdb/merg-ref-diff-docs' into 'master'
Add missing docs for merg-ref-diffs See merge request gitlab-org/gitlab!29713
parents
3fed7cd3
0d634e29
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
doc/user/project/merge_requests/img/versions_compare_head_v12_10.png
...oject/merge_requests/img/versions_compare_head_v12_10.png
+0
-0
doc/user/project/merge_requests/versions.md
doc/user/project/merge_requests/versions.md
+21
-0
No files found.
doc/user/project/merge_requests/img/versions_compare_head_v12_10.png
0 → 100644
View file @
1bf8707a
30 KB
doc/user/project/merge_requests/versions.md
View file @
1bf8707a
...
...
@@ -46,6 +46,27 @@ This only applies to commits that are in the most recent version of a merge
request - if a commit was in a merge request, then rebased out of that merge
request, they will not be linked.
## `HEAD` comparison mode for Merge Requests
> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/27008) in GitLab 12.10.
Merge Requests, particularly the
**Changes**
tab, is where source code
is reviewed and discussed. In circumstances where the target branch was
merged into the source branch of the merge request, the changes in the
source and target branch can be shown mixed together making it hard to
understand which changes are being added and which already exist in the
target branch.
In GitLab 12.10, we added an
**experimental**
comparison mode, which
shows a diff calculated by simulating how it would look like once merged - a more accurate
representation of the changes rather than using the base of the two
branches. The new mode is available from the comparison target drop down
by selecting
**master (HEAD)**
. In the future it will
[
replace
](
https://gitlab.com/gitlab-org/gitlab/issues/198458
)
the
current default comparison.
![
Merge request versions compare HEAD
](
img/versions_compare_head_v12_10.png
)
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment