cherry-pickを使う
git cherry-pick [コミットNo]
cherry-pickは特定のコミットのみ取り込むことが可能
error: commit commitNumber is a merge but no -m option was given.
fatal: cherry-pick failed
このエラーが出た場合は
git cherry-pick -m 1 [コミットNo]
あとはconflictが起きた箇所を解消すればokです。
More than 5 years have passed since last update.
Register as a new user and use Qiita more conveniently
- You get articles that match your needs
- You can efficiently read back useful information
- You can use dark theme
List of users who liked
11