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

他の人が作業中のブランチにpull Requestを送る

More than 3 years have passed since last update.

いままでずっとやり方をミスっていたのでメモ

前提

Aさんが作業していたfeature/hogeブランチがあるとする
このブランチはmasterよりだいぶ遅れている
このブランチに自分の作業分を足したい

コマンド

  1. いつものコマンド
 git checkout master
 git pull origin master
  1. Aさんが作業しているブランチに切り替える
 git checkout -b feature/hoge origin/feature/hoge
  1. AさんにPull Requestを送るため、ここからさらにブランチを切る
 git checkout -b feature/hoge_fuga

間違っていたこと

2の作業の時に

 git checkout -b feature/hoge

としていた。
これだとブランチの作成とチェックアウトを行ってしまうので、
masterからの遅れが差分として表示されてしまう

Why do not you register as a user and use Qiita more conveniently?
  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
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