First, rewinding head to replay your work on top of it... Applying: your_patch Using index info to reconstruct a base tree... M your_modified_file Falling back to patching base and 3-way merge... Auto-merging your_modified_file CONFLICT (content): Merge conflict in your_modified_file Recorded preimage for 'your_modified_file' Failed to merge in the changes. Patch failed at 0001 your_patch The copy of the patch that failed is found in: /your_prj_path/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort".
rebase in progress; onto 5ac5126 You are currently rebasing. (fix conflicts and then run "git rebase --continue") (use "git rebase --skip" to skip this patch) (use "git rebase --abort" to check out the original branch)
Unmerged paths: (use "git reset HEAD <file>..." to unstage) (use "git add <file>..." to mark resolution)
both modified: your_conflict_file
no changes added to commit (use "git add" and/or "git commit -a")