VersionCtl/git/git-imerge
をテンプレートにして作成
[
トップ
] [
新規
|
一覧
|
検索
|
最終更新
|
ヘルプ
]
開始行:
#topicpath
/////////////////////////////////////////////////////////...
* 目次 [#s2cfc07e]
#contents();
/////////////////////////////////////////////////////////...
* git-imerge - incremental merge for git [#oe28e24c]
- 2つのブランチ間のマージで conflict が発生する場合に、そ...
- これは、競合対を1対ずつ解消することにより、通常の1回の...
/////////////////////////////////////////////////////////...
* 準備 [#zfc40089]
- debian では以下のパッケージを導入する
git-imerge
/////////////////////////////////////////////////////////...
* コマンド [#z71f579d]
|~git-imergeコマンド |~git analogue ...
|git-imerge merge BRANCH |git merge BRANCH ...
|git-imerge rebase BRANCH |git rebase BRANCH ...
|git-imerge revert COMMIT |git revert COMMIT ...
|git-imerge revert COMMIT1..COMMIT2 |git revert COMMIT1....
|git-imerge drop COMMIT |git rebase --onto C...
|git-imerge drop COMMIT1..COMMIT2 |git rebase --onto C...
/////////////////////////////////////////////////////////...
* 手順 [#ue6ced0e]
//=======================================================...
** merge [#uba35c7d]
- 以下、 merge 対象を <branch-miine>, merge で取り込む相...
+ ブランチのマージを試みる（これで conflict が発生する前...
$ git-imerge merge <branch-x>
Attempting automerge of 1-3...failure.
Attempting automerge of 1-1...success.
Attempting automerge of 1-3...failure.
Attempting automerge of 1-2...failure.
Autofilling 1-1...success.
Recording autofilled block MergeState('<branch-x>', tip1...
Attempting automerge of 1-3...failure.
Attempting automerge of 1-2...failure.
Switched to branch 'imerge/<branch-x>'
Auto-merging GNUstep/Defaults/WMWindowAttributes
CONFLICT (content): Merge conflict in GNUstep/Defaults/W...
Auto-merging GNUstep/Defaults/WMState
CONFLICT (content): Merge conflict in GNUstep/Defaults/W...
Automatic merge failed; fix conflicts and then commit th...
...
（以下、commit log が表示される）
...
There was a conflict merging commit 1-2, shown above.
Please resolve the conflict, commit the result, then type
git-imerge continue
+ 上記 conflict が発生した旨メッセージが出ているので、状...
$ git st
On branch imerge/<branch-x>
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: GNUstep/Defaults/WindowMaker
modified: GNUstep/Library/WindowMaker/autostart
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: GNUstep/Defaults/WMState
both modified: GNUstep/Defaults/WMWindowAttributes
+ 通常の手順で conflict 編集を行う
+ conflict 解消したファイルについて git add まで行う（''g...
+ conflict を解消したら、merge 作業を継続する（git-imerge...
$ git-imerge continue
[imerge/<branch-x> 2acde86] imerge '<branch-x>': manual ...
Merge has been recorded for merge 1-2.
Attempting automerge of 1-3...failure.
Attempting automerge of 1-3...failure.
Switched to branch 'imerge/<branch-x>'
Auto-merging GNUstep/Defaults/WMWindowAttributes
CONFLICT (content): Merge conflict in GNUstep/Defaults/W...
Automatic merge failed; fix conflicts and then commit th...
Original first commit:
commit 06472e9c1c3fef6d2c8ff2b9fa2c1765accd2f0d (origin/...
...
（以下、commit log が表示される）
...
There was a conflict merging commit 1-3, shown above.
Please resolve the conflict, commit the result, then type
git-imerge continue
+ また conflict が発生したので、再度状態を確認
$ git st
On branch imerge/<branch-x>
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: GNUstep/.AppInfo/WindowMaker/History
modified: GNUstep/Defaults/WMState
new file: GNUstep/Library/WindowMaker/CachedPixmaps/x...
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: GNUstep/Defaults/WMWindowAttributes
+ 最終的に conflict が解消するまで、git-imerge continue ...
$ git-imerge continue
[imerge/<branch-x> e578941] imerge '<branch-x>': manual ...
Merge has been recorded for merge 1-3.
Merge is complete!
+ 最終的に conflict 解消が完了したら、git-imerge による m...
$ git-imerge finish
[<branch-mine> dcbf792] Merge <branch-x> into <branch-mi...
Date: Tue Jan 4 19:15:49 2022 +0900
+ merge の結果は <branch-mine> ではなく imerge/<branch-x>...
なので、 imerge/<branch-x> を <branch-mine> に merge する
$ git branch
* imerge/<branch-x>
<branch-mine>
$ git checkout <branch-mine>
$ git merge imerge/<branch-x>
/////////////////////////////////////////////////////////...
* link [#fc8253c4]
- [[git-imerge – gitのインクリメンタルマージ – GitHubじゃ...
終了行:
#topicpath
/////////////////////////////////////////////////////////...
* 目次 [#s2cfc07e]
#contents();
/////////////////////////////////////////////////////////...
* git-imerge - incremental merge for git [#oe28e24c]
- 2つのブランチ間のマージで conflict が発生する場合に、そ...
- これは、競合対を1対ずつ解消することにより、通常の1回の...
/////////////////////////////////////////////////////////...
* 準備 [#zfc40089]
- debian では以下のパッケージを導入する
git-imerge
/////////////////////////////////////////////////////////...
* コマンド [#z71f579d]
|~git-imergeコマンド |~git analogue ...
|git-imerge merge BRANCH |git merge BRANCH ...
|git-imerge rebase BRANCH |git rebase BRANCH ...
|git-imerge revert COMMIT |git revert COMMIT ...
|git-imerge revert COMMIT1..COMMIT2 |git revert COMMIT1....
|git-imerge drop COMMIT |git rebase --onto C...
|git-imerge drop COMMIT1..COMMIT2 |git rebase --onto C...
/////////////////////////////////////////////////////////...
* 手順 [#ue6ced0e]
//=======================================================...
** merge [#uba35c7d]
- 以下、 merge 対象を <branch-miine>, merge で取り込む相...
+ ブランチのマージを試みる（これで conflict が発生する前...
$ git-imerge merge <branch-x>
Attempting automerge of 1-3...failure.
Attempting automerge of 1-1...success.
Attempting automerge of 1-3...failure.
Attempting automerge of 1-2...failure.
Autofilling 1-1...success.
Recording autofilled block MergeState('<branch-x>', tip1...
Attempting automerge of 1-3...failure.
Attempting automerge of 1-2...failure.
Switched to branch 'imerge/<branch-x>'
Auto-merging GNUstep/Defaults/WMWindowAttributes
CONFLICT (content): Merge conflict in GNUstep/Defaults/W...
Auto-merging GNUstep/Defaults/WMState
CONFLICT (content): Merge conflict in GNUstep/Defaults/W...
Automatic merge failed; fix conflicts and then commit th...
...
（以下、commit log が表示される）
...
There was a conflict merging commit 1-2, shown above.
Please resolve the conflict, commit the result, then type
git-imerge continue
+ 上記 conflict が発生した旨メッセージが出ているので、状...
$ git st
On branch imerge/<branch-x>
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: GNUstep/Defaults/WindowMaker
modified: GNUstep/Library/WindowMaker/autostart
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: GNUstep/Defaults/WMState
both modified: GNUstep/Defaults/WMWindowAttributes
+ 通常の手順で conflict 編集を行う
+ conflict 解消したファイルについて git add まで行う（''g...
+ conflict を解消したら、merge 作業を継続する（git-imerge...
$ git-imerge continue
[imerge/<branch-x> 2acde86] imerge '<branch-x>': manual ...
Merge has been recorded for merge 1-2.
Attempting automerge of 1-3...failure.
Attempting automerge of 1-3...failure.
Switched to branch 'imerge/<branch-x>'
Auto-merging GNUstep/Defaults/WMWindowAttributes
CONFLICT (content): Merge conflict in GNUstep/Defaults/W...
Automatic merge failed; fix conflicts and then commit th...
Original first commit:
commit 06472e9c1c3fef6d2c8ff2b9fa2c1765accd2f0d (origin/...
...
（以下、commit log が表示される）
...
There was a conflict merging commit 1-3, shown above.
Please resolve the conflict, commit the result, then type
git-imerge continue
+ また conflict が発生したので、再度状態を確認
$ git st
On branch imerge/<branch-x>
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Changes to be committed:
modified: GNUstep/.AppInfo/WindowMaker/History
modified: GNUstep/Defaults/WMState
new file: GNUstep/Library/WindowMaker/CachedPixmaps/x...
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: GNUstep/Defaults/WMWindowAttributes
+ 最終的に conflict が解消するまで、git-imerge continue ...
$ git-imerge continue
[imerge/<branch-x> e578941] imerge '<branch-x>': manual ...
Merge has been recorded for merge 1-3.
Merge is complete!
+ 最終的に conflict 解消が完了したら、git-imerge による m...
$ git-imerge finish
[<branch-mine> dcbf792] Merge <branch-x> into <branch-mi...
Date: Tue Jan 4 19:15:49 2022 +0900
+ merge の結果は <branch-mine> ではなく imerge/<branch-x>...
なので、 imerge/<branch-x> を <branch-mine> に merge する
$ git branch
* imerge/<branch-x>
<branch-mine>
$ git checkout <branch-mine>
$ git merge imerge/<branch-x>
/////////////////////////////////////////////////////////...
* link [#fc8253c4]
- [[git-imerge – gitのインクリメンタルマージ – GitHubじゃ...
ページ名:
![[PukiWiki]](image/tux_100x119.jpg "[PukiWiki]")
