git push が rejected になったときの直し方｜pull --rebase とコンフリクト解消、--force-with-lease の使いどころ

• 1

git status

• 1

git stash

• 1

git branch backup-before-rebase

• 1

git pull --rebase

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9

kaito@demo:~/work/clone-a$ git pull --rebase
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
Unpacking objects: 100% (3/3), 253 bytes | 253.00 KiB/s, done.
From /home/kaito/remote/demo
   826dcaa..a1fcee5  main       -> origin/main
Successfully rebased and updated refs/heads/main.

• 1

git log --oneline --graph -n 4

• 1
• 2
• 3
• 4

kaito@demo:~/work/clone-a$ git log --oneline --graph -n 4
* 9ef4f08 (HEAD -> main) A: add a.txt
* a1fcee5 (origin/main) B: add b.txt
* 826dcaa first commit

• 1

git push

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9

kaito@demo:~/work/clone-a$ git push
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 298 bytes | 298.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
To /home/kaito/remote/demo.git
   a1fcee5..9ef4f08  main -> main

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10

git push をしたら、次のエラーが出ました。
初心者にも分かるように、何が起きているのかと、安全な直し方を順番に教えてください。
--force は使いたくありません。

【git push のエラー全文】

ブランチ名：【ブランチ名（例：main）】
このブランチを使っている人：【自分だけ／チームで共有】
git log --oneline --graph --all -n 10 の結果：【出力】
（URLにトークンが含まれる行や、社内のURLは消してから貼ります）

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10
• 11
• 12
• 13
• 14

kaito@demo:~/work/clone-a$ git pull
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10
• 11
• 12
• 13
• 14
• 15
• 16
• 17

kaito@demo:~/work/clone-a$ git pull --rebase
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
Unpacking objects: 100% (3/3), 304 bytes | 304.00 KiB/s, done.
From /home/kaito/remote/demo
   9ef4f08..9ddb534  main       -> origin/main
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
error: could not apply 903b40e... A: edit README title
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Could not apply 903b40e... A: edit README title

• 1

git status

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10
• 11
• 12
• 13
• 14
• 15
• 16

kaito@demo:~/work/clone-a$ git status
interactive rebase in progress; onto 9ddb534
Last command done (1 command done):
   pick 903b40e A: edit README title
No commands remaining.
You are currently rebasing branch 'main' on '9ddb534'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
        both modified:   README.md

no changes added to commit (use "git add" and/or "git commit -a")

• 1
• 2
• 3
• 4
• 5
• 6

kaito@demo:~/work/clone-a$ cat README.md
<<<<<<< HEAD
# demo (edited in B)
=======
# demo (edited in A)
>>>>>>> 903b40e (A: edit README title)

• 1
• 2

git add README.md
git rebase --continue

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10
• 11
• 12
• 13
• 14
• 15
• 16
• 17
• 18
• 19
• 20
• 21
• 22
• 23

kaito@demo:~/work/clone-a$ echo "# demo (edited in A and B)" > README.md
kaito@demo:~/work/clone-a$ cat README.md
# demo (edited in A and B)
kaito@demo:~/work/clone-a$ git add README.md
kaito@demo:~/work/clone-a$ GIT_EDITOR=true git rebase --continue
[detached HEAD d7fa34b] A: edit README title
 1 file changed, 1 insertion(+), 1 deletion(-)
Successfully rebased and updated refs/heads/main.
kaito@demo:~/work/clone-a$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 8 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 333 bytes | 333.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
To /home/kaito/remote/demo.git
   9ddb534..d7fa34b  main -> main
kaito@demo:~/work/clone-a$ git log --oneline --graph -n 5
* d7fa34b (HEAD -> main, origin/main) A: edit README title
* 9ddb534 B: edit README title
* 9ef4f08 A: add a.txt
* a1fcee5 B: add b.txt
* 826dcaa first commit

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10
• 11

git pull --rebase の途中でコンフリクトが起きました。
次のコンフリクト部分について、
・どちらがリモート側で、どちらが自分の変更か
・両方の意図を残すなら、どう書けばよいか
を教えてください。マーカー（<<<<<<< ======= >>>>>>>）を消した完成形も見せてください。

ファイル名：【ファイル名】
コンフリクト部分：
【<<<<<<< から >>>>>>> までの全文】

自分がこの変更でやりたかったこと：【一言で】

• 1

git rebase --abort

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10
• 11
• 12
• 13
• 14
• 15

kaito@demo:~/work/clone-a$ git rebase --abort
kaito@demo:~/work/clone-a$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" if you want to integrate the remote branch with yours)

nothing to commit, working tree clean
kaito@demo:~/work/clone-a$ git log --oneline --graph --all -n 5
* c8b3edd (HEAD -> main) A: README v2
| * f24d707 (origin/main) B: README v2
|/
* d7fa34b A: edit README title
* 9ddb534 B: edit README title
* 9ef4f08 A: add a.txt

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8

git の作業中に、いまどういう状態なのか分からなくなりました。
次の git status の結果から、
・いま何の途中なのか（rebase 中、merge 中など）
・次に打つべきコマンド
・やめて元に戻したい場合のコマンド
を、初心者向けに教えてください。

【git status の出力全文】

• 1

git push

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9

kaito@demo:~/work/clone-a$ git push
To /home/kaito/remote/demo.git
 ! [rejected]        main -> main (fetch first)
error: failed to push some refs to '/home/kaito/remote/demo.git'
hint: Updates were rejected because the remote contains work that you do not
hint: have locally. This is usually caused by another repository pushing to
hint: the same ref. If you want to integrate the remote changes, use
hint: 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8

kaito@demo:~/work/clone-a$ git push
To /home/kaito/remote/demo.git
 ! [rejected]        main -> main (non-fast-forward)
error: failed to push some refs to '/home/kaito/remote/demo.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

• 1
• 2
• 3
• 4

kaito@demo:~/work/clone-a$ git push --force-with-lease
To /home/kaito/remote/demo.git
 ! [rejected]        main -> main (stale info)
error: failed to push some refs to '/home/kaito/remote/demo.git'

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10
• 11
• 12
• 13
• 14

kaito@demo:~/work/clone-a$ git push --force
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 8 threads
Compressing objects: 100% (13/13), done.
Writing objects: 100% (21/21), 1.76 KiB | 1.76 MiB/s, done.
Total 21 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
To /home/kaito/remote/demo.git
 + 1afe5fd...fef010c main -> main (forced update)
kaito@demo:~/work/clone-a$ git log --oneline -n 4
fef010c (HEAD -> main, origin/main) A: rewrite
f24d707 B: README v2
d7fa34b A: edit README title
9ddb534 B: edit README title

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10
• 11
• 12
• 13
• 14
• 15
• 16
• 17
• 18
• 19
• 20
• 21
• 22
• 23
• 24
• 25
• 26
• 27
• 28
• 29
• 30
• 31
• 32

kaito@demo:~/work/clone-b$ git log --oneline -n 3
1afe5fd (HEAD -> main, origin/main, origin/HEAD) B: important work
f24d707 B: README v2
d7fa34b A: edit README title
kaito@demo:~/work/clone-b$ git fetch
remote: Enumerating objects: 4, done.
remote: Counting objects: 100% (4/4), done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0 (from 0)
Unpacking objects: 100% (3/3), 256 bytes | 256.00 KiB/s, done.
From /home/kaito/remote/demo
 + 1afe5fd...fef010c main       -> origin/main  (forced update)
kaito@demo:~/work/clone-b$ git status
On branch main
Your branch and 'origin/main' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" if you want to integrate the remote branch with yours)

nothing to commit, working tree clean
kaito@demo:~/work/clone-b$ git log --oneline -n 4 origin/main
fef010c (origin/main, origin/HEAD) A: rewrite
f24d707 B: README v2
d7fa34b A: edit README title
9ddb534 B: edit README title
kaito@demo:~/work/clone-b$ git log --oneline --all --graph -n 6
* 1afe5fd (HEAD -> main) B: important work
| * fef010c (origin/main, origin/HEAD) A: rewrite
|/
* f24d707 B: README v2
* d7fa34b A: edit README title
* 9ddb534 B: edit README title
* 9ef4f08 A: add a.txt

• 1

git push --force-with-lease origin 【自分の作業ブランチ名】

• 1
• 2
• 3
• 4
• 5
• 6
• 7
• 8
• 9
• 10

git push --force-with-lease を使おうか迷っています。
次の状況で使ってよいか、使うなら注意点を、使わないなら代わりの方法を教えてください。

ブランチ名：【ブランチ名】
このブランチを使っている人：【自分だけ／チームで共有】
直前にしたこと：【例：git rebase main をした／git commit --amend をした】
git log --oneline -n 5 の結果：
【出力】
git status の結果：
【出力】