Help us understand the problem. What is going on with this article?

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

More than 1 year has passed since last update.

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

tatetate55
仕事: swift, Obj-C,php 趣味: python, CAD 作ったものはブログにあげています。
http://www.tatetate55.com
yahoo-japan-corp
Yahoo! JAPAN を運営しています。
https://www.yahoo.co.jp
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
Comments
No comments
Sign up for free and join this conversation.
If you already have a Qiita account
Why do not you register as a user and use Qiita more conveniently?
You need to log in to use this function. Qiita can be used more conveniently after logging in.
You seem to be reading articles frequently this month. Qiita can be used more conveniently after logging in.
  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
ユーザーは見つかりませんでした