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

Consider provide more info for AU/UA conflict #6

Open
bootleq opened this issue Apr 6, 2016 · 0 comments
Open

Consider provide more info for AU/UA conflict #6

bootleq opened this issue Apr 6, 2016 · 0 comments

Comments

@bootleq
Copy link
Owner

bootleq commented Apr 6, 2016

The AU (added by us) conflict status may contain unmerged changes on theirs side, but git doesn't get content on :3.
Is it good to provide information that some changes is on theirs side?

Example: checkout bootleq/try-git@3ecc921 (master) and merge bootleq/try-git@2ff6871 ("conflict" branch), and see file Fm.txt.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@bootleq