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.

Sign up for GitHub

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

Jump to bottom

when merge ms-office-word file,it opened two local version. #3192

Closed
ovjust opened this issue May 4, 2016 · 2 comments
Closed

when merge ms-office-word file,it opened two local version. #3192

ovjust opened this issue May 4, 2016 · 2 comments
Labels
type: bug 🐛
Milestone
2.50

Comments

@ovjust
Copy link

ovjust commented May 4, 2016

when I try to solve word file conflict and I choose "use merge-word.js script",ms-word-soft shows it merging two local version files. It should be merging local and remote version.
gitextensions version：2.85
ms-office version:2007.
the remote version:
image
the local version:
image

the error:
image
@vbjay
Copy link
Contributor

vbjay commented May 4, 2016 •
edited

A merge has three commits.

Base:Common base commit between the two commits being merged.
Local and remote: the two commits being merged.

@jbialobr
Copy link
Member

Probably fixed in 0d1eb4c

@jbialobr jbialobr added this to the 2.50 milestone Apr 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
type: bug 🐛
Projects
None yet
Milestone
2.50
Development

No branches or pull requests
3 participants
@jbialobr @vbjay @ovjust