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

Merge conflicts are not marked in mgit st table #107

Closed
Reinmar opened this issue Jul 1, 2019 · 3 comments · Fixed by #108
Closed

Merge conflicts are not marked in mgit st table #107

Reinmar opened this issue Jul 1, 2019 · 3 comments · Fixed by #108
Assignees
Labels
Milestone

Comments

@Reinmar
Copy link
Member

Reinmar commented Jul 1, 2019

In the status it seems everything is clean:

image

@pomek
Copy link
Member

pomek commented Jul 1, 2019

Could you print git status -sb from the conflicted repository?

@pomek pomek added the type:bug label Jul 1, 2019
@Reinmar
Copy link
Member Author

Reinmar commented Jul 1, 2019

Sorry, too late.

@Reinmar
Copy link
Member Author

Reinmar commented Jul 15, 2019

OK, I executed git status -sb this time:

(merge:tags/v13.2.1^0<--remotes/origin/t/1211-Letters 23a4c02 +5 M38) p@m /...ckeditor5/packages/ckeditor5-engine> git status -sb
## master...origin/master
UU src/controller/datacontroller.js
UU src/controller/editingcontroller.js
UU src/conversion/downcastdispatcher.js
UU src/dev-utils/enableenginedebug.js
UU src/model/batch.js
UU src/model/differ.js
UU src/model/document.js
UU src/model/documentselection.js
UU src/model/liveposition.js
UU src/model/liverange.js
UU src/model/model.js
UU src/model/operation/detachoperation.js
UU src/model/operation/insertoperation.js
UU src/model/operation/markeroperation.js
UU src/model/operation/moveoperation.js
UU src/model/operation/operation.js
DU src/model/operation/reinsertoperation.js
DU src/model/operation/removeoperation.js
UU src/model/operation/renameoperation.js
UU src/model/operation/rootattributeoperation.js
UU src/model/writer.js
UU tests/controller/datacontroller.js
UU tests/dev-utils/enableenginedebug.js
UU tests/model/batch.js
UU tests/model/differ.js
UA tests/model/document.js
UU tests/model/documentselection.js
UU tests/model/liveposition.js
UU tests/model/liverange.js
UU tests/model/model.js
UU tests/model/operation/attributeoperation.js
UU tests/model/operation/detachoperation.js
UU tests/model/operation/markeroperation.js
UU tests/model/operation/nooperation.js
M  tests/model/operation/operation.js
DU tests/model/operation/reinsertoperation.js
DU tests/model/operation/removeoperation.js
UU tests/model/operation/rootattributeoperation.js
UU tests/model/writer.js
(merge:tags/v13.2.1^0<--remotes/origin/t/1211-Letters 23a4c02 +5 M38) p@m /...ckeditor5/packages/ckeditor5-engine>

As I mentioned in #108 – mgit still doesn't detect this.

Reinmar added a commit that referenced this issue Jul 15, 2019
Fix: Number of unmerged files will be shown as "modified" in the table while execution the status command. Closes #107.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants