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

Fix - merge direction #955 #968

Merged
merged 5 commits into from
Nov 30, 2020

Conversation

shamikakumar
Copy link
Contributor

Implemented #955

@codecov-io
Copy link

Codecov Report

Merging #968 (d6d3d88) into master (6c42896) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #968   +/-   ##
=======================================
  Coverage   44.58%   44.58%           
=======================================
  Files         142      142           
  Lines       11547    11547           
=======================================
  Hits         5148     5148           
  Misses       5757     5757           
  Partials      642      642           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6c42896...d6d3d88. Read the comment docs.

@itaiad200
Copy link
Contributor

@shamikakumar Thanks for your effort!
Notice the direction of the arrow is opposite to the direction of the merge.
You can switch the arrow direction, however it makes more sense if you could simply switch the labels between the base branch and the target branch. e.g. merge to master should have master on the left, arrow pointing left, and the feature branch on the right.

Copy link
Contributor

@itaiad200 itaiad200 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should switch branches so that merge direction matches.

@shamikakumar
Copy link
Contributor Author

@itaiad200 oh, my bad. I see now how that's confusing, since we're used to the GitHub convention.

@itaiad200
Copy link
Contributor

Hey @shamikakumar
You're absolutely right about keeping Github's convention!

I still see the merge direction the other way around:
image

The scenario: created feature-1 branch from master, added a single file to feature-1 branch and committed. When I'm comparing I should get the above results when master is on the left (base branch) and feature-1 branch is on the right. You can also use the description in the Merge button for the direction.

Let me know if you have any further questions, I think we're almost there :)

@shamikakumar
Copy link
Contributor Author

@itaiad200 could you check now ? I think you may be viewing my previous commit

@itaiad200
Copy link
Contributor

LGTM
Thanks for your help @shamikakumar !

@itaiad200 itaiad200 merged commit 9623170 into treeverse:master Nov 30, 2020
@shamikakumar shamikakumar deleted the fix/merge-direction-#955 branch December 1, 2020 06:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants