git log기록 merge부분
youngban@Youngui-MacBookAir board % git branch
june
* master
youngban@Youngui-MacBookAir board % git stauts
git: 'stauts' is not a git command. See 'git --help'.
The most similar command is
status
youngban@Youngui-MacBookAir board % git branch -r
origin/june
origin/master
youngban@Youngui-MacBookAir board % git branch board
youngban@Youngui-MacBookAir board % git branch
board
june
* master
youngban@Youngui-MacBookAir board % git switch board
M bin/src/main/webapp/WEB-INF/views/board/detail2.jsp
M src/main/java/connectus/ConnectusApplication.java
M src/main/java/connectus/board/BoardController.java
M src/main/java/connectus/board/BoardDAO.java
M src/main/java/connectus/board/BoardDTO.java
M src/main/java/connectus/board/BoardService.java
M src/main/java/connectus/uploadConfig.java
M src/main/resources/mybatis/mapper/board-mapping.xml
M src/main/resources/mybatis/mybatis-config.xml
M src/main/webapp/WEB-INF/views/board/detail2.jsp
M src/main/webapp/WEB-INF/views/board/list.jsp
M src/main/webapp/WEB-INF/views/board/updateform.jsp
M src/main/webapp/WEB-INF/views/board/writingform2.jsp
Switched to branch 'board'
youngban@Youngui-MacBookAir board % git add .
quote>
quote>
quote>
quote>
quote>
quote> q
quote> q
quote> exit
quote> '
[board 62d3323] board/ㄹ
4 files changed, 201 insertions(+), 54 deletions(-)
youngban@Youngui-MacBookAir board % git add .
youngban@Youngui-MacBookAir board % git commit -m 'boarduploadnew'
On branch board
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: ../../../../../../bin/src/main/webapp/WEB-INF/views/board/detail2.jsp
modified: ../../../../java/connectus/ConnectusApplication.java
modified: ../../../../java/connectus/board/BoardController.java
modified: ../../../../java/connectus/board/BoardDAO.java
modified: ../../../../java/connectus/board/BoardDTO.java
modified: ../../../../java/connectus/board/BoardService.java
modified: ../../../../java/connectus/uploadConfig.java
modified: ../../../../resources/mybatis/mapper/board-mapping.xml
modified: ../../../../resources/mybatis/mybatis-config.xml
Untracked files:
(use "git add <file>..." to include in what will be committed)
../../../../java/connectus/comment/
../../../../resources/mybatis/mapper/comment-mapping.xml
no changes added to commit (use "git add" and/or "git commit -a")
youngban@Youngui-MacBookAir board % git push origin board
To https://github.com/ConnectusProject/ConnectusProject.git
! [rejected] board -> board (fetch first)
error: failed to push some refs to 'https://github.com/ConnectusProject/ConnectusProject.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
youngban@Youngui-MacBookAir board % git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
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.
remote: Enumerating objects: 329, done.
remote: Counting objects: 100% (329/329), done.
remote: Compressing objects: 100% (135/135), done.
remote: Total 287 (delta 132), reused 256 (delta 109), pack-reused 0
Receiving objects: 100% (287/287), 1.78 MiB | 2.02 MiB/s, done.
Resolving deltas: 100% (132/132), completed with 21 local objects.
From https://github.com/ConnectusProject/ConnectusProject
* [new branch] board -> origin/board
f4e28c4..6a0e181 june -> origin/june
3d2a382..cbae493 master -> origin/master
* [new branch] navbar -> origin/navbar
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.
git pull <remote> <branch>
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream-to=origin/<branch> board
youngban@Youngui-MacBookAir board % git add .
youngban@Youngui-MacBookAir board % git commit -m
error: switch `m' requires a value
youngban@Youngui-MacBookAir board % git commit -m 'boardupload'
On branch board
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: ../../../../../../bin/src/main/webapp/WEB-INF/views/board/detail2.jsp
modified: ../../../../java/connectus/ConnectusApplication.java
modified: ../../../../java/connectus/board/BoardController.java
modified: ../../../../java/connectus/board/BoardDAO.java
modified: ../../../../java/connectus/board/BoardDTO.java
modified: ../../../../java/connectus/board/BoardService.java
modified: ../../../../java/connectus/uploadConfig.java
modified: ../../../../resources/mybatis/mapper/board-mapping.xml
modified: ../../../../resources/mybatis/mybatis-config.xml
Untracked files:
(use "git add <file>..." to include in what will be committed)
../../../../java/connectus/comment/
../../../../resources/mybatis/mapper/comment-mapping.xml
no changes added to commit (use "git add" and/or "git commit -a")
youngban@Youngui-MacBookAir board % git push origin board
To https://github.com/ConnectusProject/ConnectusProject.git
! [rejected] board -> board (non-fast-forward)
error: failed to push some refs to 'https://github.com/ConnectusProject/ConnectusProject.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
youngban@Youngui-MacBookAir board % git add .
youngban@Youngui-MacBookAir board % git commit -m 'boardupload'
On branch board
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: ../../../../../../bin/src/main/webapp/WEB-INF/views/board/detail2.jsp
modified: ../../../../java/connectus/ConnectusApplication.java
modified: ../../../../java/connectus/board/BoardController.java
modified: ../../../../java/connectus/board/BoardDAO.java
modified: ../../../../java/connectus/board/BoardDTO.java
modified: ../../../../java/connectus/board/BoardService.java
modified: ../../../../java/connectus/uploadConfig.java
modified: ../../../../resources/mybatis/mapper/board-mapping.xml
modified: ../../../../resources/mybatis/mybatis-config.xml
Untracked files:
(use "git add <file>..." to include in what will be committed)
../../../../java/connectus/comment/
../../../../resources/mybatis/mapper/comment-mapping.xml
no changes added to commit (use "git add" and/or "git commit -a")
youngban@Youngui-MacBookAir board % git push origin board
To https://github.com/ConnectusProject/ConnectusProject.git
! [rejected] board -> board (fetch first)
error: failed to push some refs to 'https://github.com/ConnectusProject/ConnectusProject.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
youngban@Youngui-MacBookAir board % git branch
* board
june
master
youngban@Youngui-MacBookAir board % pwd
/Users/youngban/git/ConnectUsProject/connectus/src/main/webapp/WEB-INF/views/board
youngban@Youngui-MacBookAir board % git pull origin
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
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.
remote: Enumerating objects: 1, done.
remote: Counting objects: 100% (1/1), done.
remote: Total 1 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (1/1), 619 bytes | 619.00 KiB/s, done.
From https://github.com/ConnectusProject/ConnectusProject
4729fbc..f66a84d board -> origin/board
You asked to pull from the remote 'origin', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
youngban@Youngui-MacBookAir board % git add .
youngban@Youngui-MacBookAir board % git commit -m 'boardupload'
On branch board
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: ../../../../../../bin/src/main/webapp/WEB-INF/views/board/detail2.jsp
modified: ../../../../java/connectus/ConnectusApplication.java
modified: ../../../../java/connectus/board/BoardController.java
modified: ../../../../java/connectus/board/BoardDAO.java
modified: ../../../../java/connectus/board/BoardDTO.java
modified: ../../../../java/connectus/board/BoardService.java
modified: ../../../../java/connectus/uploadConfig.java
modified: ../../../../resources/mybatis/mapper/board-mapping.xml
modified: ../../../../resources/mybatis/mybatis-config.xml
Untracked files:
(use "git add <file>..." to include in what will be committed)
../../../../java/connectus/comment/
../../../../resources/mybatis/mapper/comment-mapping.xml
no changes added to commit (use "git add" and/or "git commit -a")
youngban@Youngui-MacBookAir board % git push origin board
To https://github.com/ConnectusProject/ConnectusProject.git
! [rejected] board -> board (non-fast-forward)
error: failed to push some refs to 'https://github.com/ConnectusProject/ConnectusProject.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
youngban@Youngui-MacBookAir board % git branch master
fatal: A branch named 'master' already exists.
youngban@Youngui-MacBookAir board % git checkout master
M bin/src/main/webapp/WEB-INF/views/board/detail2.jsp
M src/main/java/connectus/ConnectusApplication.java
M src/main/java/connectus/board/BoardController.java
M src/main/java/connectus/board/BoardDAO.java
M src/main/java/connectus/board/BoardDTO.java
M src/main/java/connectus/board/BoardService.java
M src/main/java/connectus/uploadConfig.java
M src/main/resources/mybatis/mapper/board-mapping.xml
M src/main/resources/mybatis/mybatis-config.xml
Switched to branch 'master'
Your branch is behind 'origin/master' by 26 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
youngban@Youngui-MacBookAir board % git branch
board
june
* master
youngban@Youngui-MacBookAir board % git checkout board
M bin/src/main/webapp/WEB-INF/views/board/detail2.jsp
M src/main/java/connectus/ConnectusApplication.java
M src/main/java/connectus/board/BoardController.java
M src/main/java/connectus/board/BoardDAO.java
M src/main/java/connectus/board/BoardDTO.java
M src/main/java/connectus/board/BoardService.java
M src/main/java/connectus/uploadConfig.java
M src/main/resources/mybatis/mapper/board-mapping.xml
M src/main/resources/mybatis/mybatis-config.xml
Switched to branch 'board'
youngban@Youngui-MacBookAir board % pwd
/Users/youngban/git/ConnectUsProject/connectus/src/main/webapp/WEB-INF/views/board
youngban@Youngui-MacBookAir board % cd ..
youngban@Youngui-MacBookAir views % cd ..
youngban@Youngui-MacBookAir WEB-INF % cd ..
youngban@Youngui-MacBookAir webapp % cd ..
youngban@Youngui-MacBookAir main % cd ..
youngban@Youngui-MacBookAir src % cd ..
youngban@Youngui-MacBookAir connectus % cd ..
youngban@Youngui-MacBookAir ConnectUsProject % cd ..
youngban@Youngui-MacBookAir git % cd ..
youngban@Youngui-MacBookAir ~ % cd ..
youngban@Youngui-MacBookAir /Users % cd ..
youngban@Youngui-MacBookAir / % cd ..
youngban@Youngui-MacBookAir / % cd ..
youngban@Youngui-MacBookAir / % cd git
cd: no such file or directory: git
youngban@Youngui-MacBookAir / % cd Users
youngban@Youngui-MacBookAir /Users % cd youngban
youngban@Youngui-MacBookAir ~ % cd git
youngban@Youngui-MacBookAir git % cd ConnectUsProject
youngban@Youngui-MacBookAir ConnectUsProject % cd connectus
youngban@Youngui-MacBookAir connectus % cd
youngban@Youngui-MacBookAir ~ % pwd
/Users/youngban
youngban@Youngui-MacBookAir ~ % cd git
youngban@Youngui-MacBookAir git % ls
ConnectUsProject connectus20220919 forktest20220920 githubtest20220919 pushpull
youngban@Youngui-MacBookAir git % cd ConnectUsProject
youngban@Youngui-MacBookAir ConnectUsProject % cd connectus
youngban@Youngui-MacBookAir connectus % git branch
* board
june
master
youngban@Youngui-MacBookAir connectus % git pull origin board
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
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.
From https://github.com/ConnectusProject/ConnectusProject
* branch board -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
src/main/java/connectus/board/BoardController.java
src/main/java/connectus/board/BoardDAO.java
src/main/java/connectus/board/BoardDTO.java
src/main/java/connectus/board/BoardService.java
src/main/resources/mybatis/mapper/board-mapping.xml
Please commit your changes or stash them before you merge.
Aborting
youngban@Youngui-MacBookAir connectus % git add
Nothing specified, nothing added.
hint: Maybe you wanted to say 'git add .'?
hint: Turn this message off by running
hint: "git config advice.addEmptyPathspec false"
youngban@Youngui-MacBookAir connectus % git add .
youngban@Youngui-MacBookAir connectus % git commit -m '1'
[board bf18ed9] 1
13 files changed, 284 insertions(+), 99 deletions(-)
create mode 100644 src/main/java/connectus/comment/CommentController.java
create mode 100644 src/main/java/connectus/comment/CommentDAO.java
create mode 100644 src/main/java/connectus/comment/CommentDTO.java
create mode 100644 src/main/resources/mybatis/mapper/comment-mapping.xml
youngban@Youngui-MacBookAir connectus % git push origin master
To https://github.com/ConnectusProject/ConnectusProject.git
! [rejected] master -> master (fetch first)
error: failed to push some refs to 'https://github.com/ConnectusProject/ConnectusProject.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
youngban@Youngui-MacBookAir connectus % git branch
* board
june
master
youngban@Youngui-MacBookAir connectus % git pull origin
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
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.
remote: Enumerating objects: 21, done.
remote: Counting objects: 100% (21/21), done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 13 (delta 6), reused 10 (delta 6), pack-reused 0
Unpacking objects: 100% (13/13), 3.78 KiB | 387.00 KiB/s, done.
From https://github.com/ConnectusProject/ConnectusProject
6a0e181..b71cafa june -> origin/june
cbae493..0f515e9 master -> origin/master
You asked to pull from the remote 'origin', but did not specify
a branch. Because this is not the default configured remote
for your current branch, you must specify a branch on the command line.
youngban@Youngui-MacBookAir connectus % git checkout master
Switched to branch 'master'
Your branch is behind 'origin/master' by 30 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
youngban@Youngui-MacBookAir connectus % git pull origin master
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
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.
From https://github.com/ConnectusProject/ConnectusProject
* branch master -> FETCH_HEAD
Updating 3d2a382..0f515e9
Fast-forward
src/main/java/connectus/board/BoardController.java | 135 +++++++++++++++++++++++++++++++++++------------------------------------
src/main/java/connectus/board/BoardDAO.java | 4 +--
src/main/java/connectus/board/BoardDTO.java | 32 +++++++++++++----
src/main/java/connectus/board/BoardService.java | 42 +++++++++++++----------
src/main/java/connectus/member/MemberController.java | 6 ++--
src/main/java/connectus/member/MemberDAO.java | 32 +++++++----------
src/main/java/connectus/member/MemberService.java | 59 +++++++++++++++++++++++++++----
src/main/java/connectus/member/MemberServiceImpl.java | 62 ---------------------------------
src/main/java/connectus/product/ProductController.java | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------
src/main/java/connectus/product/ProductDAO.java | 20 +++++++++++
src/main/java/connectus/product/ProductDTO.java | 77 +++++++++++++++++++++++++++++++++++++----
src/main/java/connectus/product/UploadDTO.java | 58 +++++++++++++++++++++++++++++++
src/main/resources/mybatis/mapper/Product-mapping.xml | 6 ++--
src/main/resources/mybatis/mapper/board-mapping.xml | 8 ++++-
src/main/resources/mybatis/mapper/member-mapping.xml | 9 ++---
src/main/resources/mybatis/mapper/zzim-mapping.xml | 51 +++++++++++++++++++++++++++
src/main/resources/static/css/login.css | 184 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/resources/static/css/navbar.css | 244 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/resources/static/css/register.css | 181 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/resources/static/fonts/BMYEONSUNG_ttf.ttf | Bin 0 -> 1898404 bytes
src/main/resources/static/js/navbar.js | 35 +++++++++++++++++++
src/main/resources/static/pictures/Kakao_logo.jpg | Bin 0 -> 40974 bytes
src/main/resources/static/pictures/connectus.png | Bin 0 -> 6375 bytes
src/main/resources/static/pictures/login-bg.jpg | Bin 0 -> 67409 bytes
src/main/resources/static/pictures/naver-logo.png | Bin 0 -> 14255 bytes
src/main/resources/static/pictures/noimg.png | Bin 0 -> 716783 bytes
src/main/resources/static/pictures/nozzim.png | Bin 0 -> 83624 bytes
src/main/resources/static/pictures/zzim.png | Bin 0 -> 179218 bytes
src/main/webapp/WEB-INF/views/board/detail2.jsp | 43 ++++++++---------------
src/main/webapp/WEB-INF/views/board/list.jsp | 24 ++++++++++++-
src/main/webapp/WEB-INF/views/board/test.html | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/webapp/WEB-INF/views/board/updateform.jsp | 7 ++--
src/main/webapp/WEB-INF/views/board/writingform2.jsp | 3 --
src/main/webapp/WEB-INF/views/header.jsp | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
src/main/webapp/WEB-INF/views/member/login.jsp | 42 ++++++++++++++++++++---
src/main/webapp/WEB-INF/views/member/register.jsp | 71 ++++++++++++++++++++++++++++++++++++--
src/main/webapp/WEB-INF/views/product/allProduct.jsp | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
src/main/webapp/WEB-INF/views/product/insertProductForm.jsp | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
src/main/webapp/WEB-INF/views/product/oneProduct.jsp | 142 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
src/main/webapp/WEB-INF/views/product/reservationinput.jsp | 2 +-
src/main/webapp/WEB-INF/views/product/searchList.jsp | 12 +++++--
src/main/webapp/WEB-INF/views/product/updateProductForm.jsp | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
42 files changed, 2165 insertions(+), 320 deletions(-)
delete mode 100644 src/main/java/connectus/member/MemberServiceImpl.java
create mode 100644 src/main/java/connectus/product/UploadDTO.java
create mode 100644 src/main/resources/mybatis/mapper/zzim-mapping.xml
create mode 100644 src/main/resources/static/css/login.css
create mode 100644 src/main/resources/static/css/navbar.css
create mode 100644 src/main/resources/static/css/register.css
create mode 100644 src/main/resources/static/fonts/BMYEONSUNG_ttf.ttf
create mode 100644 src/main/resources/static/js/navbar.js
create mode 100644 src/main/resources/static/pictures/Kakao_logo.jpg
create mode 100644 src/main/resources/static/pictures/connectus.png
create mode 100644 src/main/resources/static/pictures/login-bg.jpg
create mode 100644 src/main/resources/static/pictures/naver-logo.png
create mode 100644 src/main/resources/static/pictures/noimg.png
create mode 100644 src/main/resources/static/pictures/nozzim.png
create mode 100644 src/main/resources/static/pictures/zzim.png
create mode 100644 src/main/webapp/WEB-INF/views/board/test.html
create mode 100644 src/main/webapp/WEB-INF/views/header.jsp
youngban@Youngui-MacBookAir connectus % git stauts
git: 'stauts' is not a git command. See 'git --help'.
The most similar command is
status
youngban@Youngui-MacBookAir connectus % git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
youngban@Youngui-MacBookAir connectus % git switch board
Switched to branch 'board'
youngban@Youngui-MacBookAir connectus % git switch master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
youngban@Youngui-MacBookAir connectus % git switch board
Switched to branch 'board'
youngban@Youngui-MacBookAir connectus % git add .
youngban@Youngui-MacBookAir connectus % git commit -m 'boardupload'
On branch board
nothing to commit, working tree clean
youngban@Youngui-MacBookAir connectus % git switch master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.
youngban@Youngui-MacBookAir connectus % git merge board
Auto-merging src/main/webapp/WEB-INF/views/board/updateform.jsp
CONFLICT (content): Merge conflict in src/main/webapp/WEB-INF/views/board/updateform.jsp
Auto-merging src/main/webapp/WEB-INF/views/board/list.jsp
CONFLICT (content): Merge conflict in src/main/webapp/WEB-INF/views/board/list.jsp
Auto-merging src/main/webapp/WEB-INF/views/board/detail2.jsp
CONFLICT (content): Merge conflict in src/main/webapp/WEB-INF/views/board/detail2.jsp
Auto-merging src/main/java/connectus/board/BoardService.java
CONFLICT (content): Merge conflict in src/main/java/connectus/board/BoardService.java
Auto-merging src/main/java/connectus/board/BoardController.java
CONFLICT (content): Merge conflict in src/main/java/connectus/board/BoardController.java
Automatic merge failed; fix conflicts and then commit the result.
youngban@Youngui-MacBookAir connectus %