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

masterブランチを別のブランチに書き換え方法

More than 1 year has passed since last update.

作ったブランチ(sub-branch)を用いて、masterブランチを完全に書き換える。

$ git checkout sub-branch
$ git merge -s ours master
$ git checkout master
$ git merge sub-branch
$ git push origin master

-s ours = --strategy=ours

Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried.
If there is no -s option, a built-in list of strategies is used instead (git merge-recursive when merging a single head, git merge-octopus otherwise).

以上です。

参照
git-merge

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
ユーザーは見つかりませんでした