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

Merging the delete files without conflict #683

Open
zzzzzeus opened this issue Dec 7, 2018 · 0 comments
Open

Merging the delete files without conflict #683

zzzzzeus opened this issue Dec 7, 2018 · 0 comments

Comments

@zzzzzeus
Copy link

zzzzzeus commented Dec 7, 2018 •
edited
Loading

Hi,
THe file delete on local branch , modified on remote branch, no conflict when I merge with -(BOOL)mergeBranchIntoCurrentBranch:(GTBranch *)fromBranch withError:(NSError **)error;
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
@zzzzzeus