git svn rebase 㧠conflict ã—ãŸã¨ãã®è§£æ¶ˆæ‰‹é † - 日曜プãƒã‚°ãƒ©ãƒžãŒãƒ€ãƒ©ãƒ€ãƒ©æ›¸ãメモ。 $ git svn rebaseã—ãŸã¨ãã«ã€è‡ªå‹•çš„ã«ãƒžãƒ¼ã‚¸ã§ããšã€ CONFLICT (content): Merge conflict in path/to/conflicted_fileWhen you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/trunk: command returned error: 1 ã“ã‚“ãªãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ãŒå‡ºãŸã¨ãã®è§£æ¶ˆæ‰‹é †ã€‚ status を確èªã™ã‚‹ã¨ã“ã‚“
{{#tags}}- {{label}}
{{/tags}}