Skip to main content

Reordering commits

You can use GitHub Desktop to reorder commits in your branch's history.

About reordering a commit

Reordering allows you to alter your commit history to provide a more meaningful progression of commits. GitHub Desktop allows you to drag-and-drop commits in your branch's history to reorder them.

Reordering a commit

  1. GitHub Desktopで、Current Branch(現在のブランチ)をクリックしてください。 現在のブランチのドロップダウンメニュー
  2. In the list of branches, click the branch with the commits that you want to reorder.
  3. History(履歴)をクリックしてください。 サイドバーで選択されている履歴タブ
  4. Drag the commit that you want to reorder and drop it between two adjoining commits. reorder drag and drop While the application reorders the commits, a Reorder in process dialog indicates the progress of the change.

Error messages when reordering commits

When you reorder commits, you may see one of the following notifications or error messages.

  • A notification states that the requested change to the branch will require a force push to update the remote branch. This is shown when the commits that you reordered were previously pushed to the remote branch. Force pushing alters the commit history of the branch and will affect other collaborators who are working in that branch. Select Begin reorder to start the reorder, and then click Force push origin to push your changes.

    reorder force push dialog

  • An error states that the reorder failed because there is a merge commit among the reordered commits.

    reorder merge commit dialog

  • A notification is shown indicating that there are uncommitted changes present on your current branch. Select Stash Changes and Continue to store the changes and proceed, or select Close to dismiss the message and commit the changes. When there are no longer any uncommitted changes, you can reorder your commits.

    reorder stash dialog

  • A message states that there are merge conflicts that you must resolve before the application can continue reordering commits on your branch.

    1. Click View conflicts to see the conflicts. reorder resolve conflicts message
    2. テキストエディタ、コマンドライン、または他のツールなどの好みの方法で、マージコンフリクトがあれば解決してください。 詳細は「マージコンフリクトに対処する」を参照してください。
    3. When all conflicts are resolved, you can reorder your commits.