Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wrong merge request changes. #13

Open
Indomitable opened this issue Jan 21, 2020 · 3 comments
Open

Wrong merge request changes. #13

Indomitable opened this issue Jan 21, 2020 · 3 comments
Assignees
Labels
Documentation Improvements or additions to documentation Enhancement New feature or request

Comments

@Indomitable
Copy link

Hi,
First I want to say this is good idea which can be very useful.
One thing that I found is that in the "Merge Request's Changes" diff is generated between the base commit and HEAD, but it should be between target branch and HEAD.
The command git diff target-branch...merge-request-branch gives exactly what we need.

The problem is visible if there is a long running MR with updates from target branch, then in changes we show changes which actually were done in target branch.

@nhat-phan nhat-phan self-assigned this Jan 23, 2020
@nhat-phan
Copy link
Owner

Thank you for your feedback.

Unfortunately, I can't guarantee that the plugin works 100% automatically in all cases. Depending on the git process and situation, the plugin requires some manual work from developers. For example, you have to update/pull the target branch manually if the target branch was rebased before clicking "Code Review".

I'll add a new feature that automatically fetches and pulls the target branch before displaying changes. Also in case there are any problems, the feature will show a message displaying tasks that have to be done manually.

Hope it helps.

@nhat-phan nhat-phan added Enhancement New feature or request Documentation Improvements or additions to documentation labels Jan 23, 2020
@XIII-th
Copy link

XIII-th commented Oct 9, 2020

@nhat-phan it's important feature for big teams. When I get a merge request, the diff view doesn't take me enough information about changes because it out of date. File can be changed a lot at the moment and target branch's HEAD moved forward.
Because of it, I unable to use this wonderful plugin in most cases (

@bojanbg
Copy link

bojanbg commented May 26, 2021

Both my target branch and source branch are up to date locally, yet I still see changes that don't appear in the GitLab web view.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Documentation Improvements or additions to documentation Enhancement New feature or request
Projects
None yet
Development

No branches or pull requests

4 participants