Qiita Teams that are logged in
You are not logged in to any team

Log in to Qiita Team
Community
OrganizationEventAdvent CalendarQiitadon (β)
Service
Qiita JobsQiita ZineQiita Blog
1
Help us understand the problem. What are the problem?

More than 3 years have passed since last update.

@tatetate55

コミットした内容を他のブランチで読み込む(cherry-pick)

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です。

Why not register and get more from Qiita?
  1. We will deliver articles that match you
    By following users and tags, you can catch up information on technical fields that you are interested in as a whole
  2. you can read useful information later efficiently
    By "stocking" the articles you like, you can search right away
1
Help us understand the problem. What are the problem?