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

Unmerged files will be counted as modified during "mgit status" #108

Merged
merged 3 commits into from
Jul 15, 2019

Conversation

pomek
Copy link
Member

@pomek pomek commented Jul 3, 2019

Suggested merge commit message (convention)

Fix: Number of unmerged files will be shown as "modified" in the table while execution the status command. Closes #107.

@pomek pomek mentioned this pull request Jul 3, 2019
10 tasks
@coveralls
Copy link

coveralls commented Jul 3, 2019

Pull Request Test Coverage Report for Build 325

  • 4 of 4 (100.0%) changed or added relevant lines in 1 file are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage increased (+0.002%) to 99.251%

Totals Coverage Status
Change from base Build 321: 0.002%
Covered Lines: 504
Relevant Lines: 504

💛 - Coveralls

@mlewand mlewand self-requested a review July 12, 2019 06:34
Copy link
Contributor

@mlewand mlewand left a comment

Choose a reason for hiding this comment

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

Guys, I think we should differentiate between modified and unversioned as there's a major semantic difference between the two.

So it should be like M1U1 etc.

@Reinmar
Copy link
Member

Reinmar commented Jul 15, 2019

It still doesn't detect merge conflicts:

image

I tried to do git merge --no-ff origin/t/ckeditor5/721-a in ckeditor5-engine to create those conflicts.

Copy link
Member

@Reinmar Reinmar left a comment

Choose a reason for hiding this comment

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

Still doesn't detect merge conflicts.

@pomek
Copy link
Member Author

pomek commented Jul 15, 2019

@Reinmar, now it will work.

@Reinmar Reinmar merged commit 5481260 into master Jul 15, 2019
@Reinmar Reinmar deleted the t/107 branch July 15, 2019 11:33
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.

Merge conflicts are not marked in mgit st table
4 participants