Hi, *Step 1:*- I have updated one file into git and commit and push into my master branch.
*Step 2:-* Then on the separate folder where I have git-svn repo. I have run below command:- gitsvntest$ *git checkout master* *Step 3:-* gitsvntest$ *git svn rebase # *After running rebase it show me conflict First, rewinding head to replay your work on top of it... Applying: test git space Using index info to reconstruct a base tree... M testgit.php Falling back to patching base and 3-way merge... Auto-merging testgit.php CONFLICT (content): Merge conflict in testgit.php Failed to merge in the changes. Patch failed at 0001 test git space The copy of the patch that failed is found in: /home/sggoyal/gitsvn/gitsvntest/.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 refs/remotes/trunk: command returned error: 1 *Step 4:-* $*vi testgit.php # *Then I open the file and modified it (resolved conflicts) and save *Step 5:-* $*git add testgit.php * *Step 6:-* *$ git rebase --continue * Applying: test git space No changes - did you forget to use 'git add'? If there is nothing left to stage, chances are that something else already introduced the same changes; you might want to skip this 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". Why does it show above suggestion? Why not accept changes? Regards, Saurabh Goyal -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
