SAMSUNG@DESKTOP-U4636R1 MINGW64 ~
$ cd Documents/git_ws/
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws
$ mkdir conflict_project
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws
$ cd conflict_project/
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project
$ git init
Initialized empty Git repository in C:/Users/SAMSUNG/Documents/git_ws/conflict_project/.git/
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ cat > conflict.txt
This is
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ cat conflict.txt
This is
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git status
On branch master
No commits yet
Untracked files:
(use "git add ..." to include in what will be committed)
conflict.txt
nothing added to commit but untracked files present (use "git add" to track)
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git add conflict.txt
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached ..." to unstage)
new file: conflict.txt
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git commit -m 'create' conflict.txt
[master (root-commit) 73a83b6] create
1 file changed, 1 insertion(+)
create mode 100644 conflict.txt
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git checkout -b dev
Switched to a new branch 'dev'
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev)
$ cat > conflict.txt
This is merge test.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev)
$ git status
On branch dev
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: conflict.txt
no changes added to commit (use "git add" and/or "git commit -a")
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev)
$ cat conflict.txt
This is merge test.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev)
$ git add conflict.txt
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev)
$ git status
On branch dev
Changes to be committed:
(use "git restore --staged ..." to unstage)
modified: conflict.txt
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev)
$ git commit -m 'modify' conflict.txt
[dev b7a6574] modify
1 file changed, 1 insertion(+), 1 deletion(-)
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev)
$ git checkout master
Switched to branch 'master'
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ cat conflict.txt
This is
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git merge dev
Updating 73a83b6..b7a6574
Fast-forward
conflict.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ cat conflict.txt
This is merge test.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git checkout -b dev2
Switched to a new branch 'dev2'
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev2)
$ git checkout master
Switched to branch 'master'
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ cat > conflict.txt
This is conflict test.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ cat conflict.txt
This is conflict test.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git checkout dev2
Switched to branch 'dev2'
M conflict.txt
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev2)
$ ls
conflict.txt
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev2)
$ git checkout master
Switched to branch 'master'
M conflict.txt
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git status
On branch master
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: conflict.txt
no changes added to commit (use "git add" and/or "git commit -a")
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git commit -m 'modify -conflict' conflict.txt
[master 82e25b7] modify -conflict
1 file changed, 1 insertion(+), 1 deletion(-)
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git branch
dev
dev2
- master
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git checkout dev2
Switched to branch 'dev2'
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev2)
$ cat > conflict.txt
This is log test.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev2)
$ cat conflict.txt
This is log test.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev2)
$ git status
On branch dev2
Changes not staged for commit:
(use "git add ..." to update what will be committed)
(use "git restore ..." to discard changes in working directory)
modified: conflict.txt
no changes added to commit (use "git add" and/or "git commit -a")
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev2)
$ git commit -m 'modify -log' conflict.txt
[dev2 16bde30] modify -log
1 file changed, 1 insertion(+), 1 deletion(-)
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev2)
$ cat conflict.txt
This is log test.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (dev2)
$ git checkout master
Switched to branch 'master'
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git merge dev2
Auto-merging conflict.txt
CONFLICT (content): Merge conflict in conflict.txt
Automatic merge failed; fix conflicts and then commit the result.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master|MERGING)
$ git merge tool
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master|MERGING)
$ git mergetool
Merging:
conflict.txt
Normal merge conflict for 'conflict.txt':
{local}: modified file
{remote}: modified file
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master|MERGING)
$ git status
On branch master
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
Changes to be committed:
modified: conflict.txt
Untracked files:
(use "git add ..." to include in what will be committed)
conflict.txt.orig
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master|MERGING)
$ git add conflict.txt
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master|MERGING)
$ git commit
[master af6516e] Merge branch 'dev2'
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ cat conflict.txt
This is conflict test.
SAMSUNG@DESKTOP-U4636R1 MINGW64 ~/Documents/git_ws/conflict_project (master)
$ git log
