Merge Request Diff

Created by: klj613

Scenario:

• Feature branch takes 3 days to complete.
• Feature branch has been kept up to date with master.
• Merge request feature branch --> master.
• MR's diff also shows the changes from the merge commits which has code from master.

I would consider this a bug. Since that code is already in master and the feature branch has nothing to do with it.

Created by: bendavies

+1 this. github works around this and won't show the merged commits. It almost makes gitlabs merge UI unusable.

By Administrator on 2012-08-15T11:22:23 (imported from GitLab project)

By Administrator on 2012-08-15T11:22:23 (imported from GitLab)

Created by: rodnaph

+1

By Administrator on 2012-08-15T11:22:30 (imported from GitLab project)

By Administrator on 2012-08-15T11:22:30 (imported from GitLab)

Created by: gavD

+1

By Administrator on 2012-08-15T11:22:36 (imported from GitLab project)

By Administrator on 2012-08-15T11:22:36 (imported from GitLab)

Created by: garethrees

+1

By Administrator on 2012-08-15T11:43:23 (imported from GitLab project)

By Administrator on 2012-08-15T11:43:23 (imported from GitLab)

Created by: bendavies

git diff ... does not show merged commits between branches, so this is certainly a bug with how the diffs are being created for the merge requests.

By Administrator on 2012-08-15T13:08:54 (imported from GitLab project)

By Administrator on 2012-08-15T13:08:54 (imported from GitLab)

Created by: dosire

Duplicate of #893 (closed)

By Administrator on 2012-08-21T18:45:44 (imported from GitLab project)

By Administrator on 2012-08-21T18:45:44 (imported from GitLab)

Created by: dosire

We fixed this issue, please +1 the pull request https://github.com/gitlabhq/gitlabhq/pull/1263

By Administrator on 2012-08-21T21:15:50 (imported from GitLab project)

By Administrator on 2012-08-21T21:15:50 (imported from GitLab)

Created by: garethrees

+1 for #1263

By Administrator on 2012-08-21T21:39:29 (imported from GitLab project)

By Administrator on 2012-08-21T21:39:29 (imported from GitLab)

Created by: sriharshav

+1 for #1263

By Administrator on 2012-08-21T23:16:07 (imported from GitLab project)

By Administrator on 2012-08-21T23:16:07 (imported from GitLab)

Created by: nickbroon

Can be closed now as #1263 has been fixed and pulled.

By Administrator on 2012-11-13T16:22:47 (imported from GitLab project)

By Administrator on 2012-11-13T16:22:47 (imported from GitLab)