merge log

`➜ ft_irc git:(master) ✗ git remote -v origin https://github.com/HanGyeolN/ft_irc.git (fetch) origin https://github.com/HanGyeolN/ft_irc.git (push) ➜ ft_irc git:(master) ✗ git remote add ircorigin https://github.com/AMATEURTOSS/ft_irc.git error: could not lock config file .git/config: No space left on device fatal: could not set 'remote.ircorigin.url' to 'https://github.com/AMATEURTOSS/ft_irc.git' ➜ ft_irc git:(master) ✗ git remote add ircorigin https://github.com/AMATEURTOSS/ft_irc.git ➜ ft_irc git:(master) ✗ git pull Already up to date. ➜ ft_irc git:(master) ✗ git pull ircorigin remote: Enumerating objects: 15, done. remote: Counting objects: 100% (15/15), done. remote: Compressing objects: 100% (5/5), done. remote: Total 10 (delta 6), reused 7 (delta 5), pack-reused 0 Unpacking objects: 100% (10/10), done. From https://github.com/AMATEURTOSS/ft_irc

• [new branch] master -> ircorigin/master You asked to pull from the remote 'ircorigin', 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. ➜ ft_irc git:(master) ✗ git status On branch master Your branch is up to date with 'origin/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: Channel.cpp modified: Channel.hpp modified: Member.cpp modified: command/JoinCommand.cpp modified: command/PartCommand.cpp modified: ft_irc.cpp

Untracked files: (use "git add ..." to include in what will be committed) main_server.sh server server.dSYM/ sub_server.sh

no changes added to commit (use "git add" and/or "git commit -a") ➜ ft_irc git:(master) ✗ git merge ircorigin/master Updating 408aac8..e562f02 error: Your local changes to the following files would be overwritten by merge: ft_irc.cpp Please commit your changes or stash them before you merge. Aborting ➜ ft_irc git:(master) ✗ git add ft_irc.cpp
➜ ft_irc git:(master) ✗ git commit -m "c" ft_irc.cpp [master 8dc0760] c Committer: Hangyeol Na hna@c2r2s5.42seoul.kr Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly:

git config --global user.name "Your Name"
git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

git commit --amend --reset-author

1 file changed, 1 insertion(+), 10 deletions(-) ➜ ft_irc git:(master) ✗ git merge ircorigin/master
Auto-merging ft_irc.cpp Merge made by the 'recursive' strategy. command/SquitCommand.cpp | 23 ++++++++++++++++++++--- command/SquitCommand.hpp | 1 + ft_irc.cpp | 1 + 3 files changed, 22 insertions(+), 3 deletions(-) ➜ ft_irc git:(master) ✗ git status On branch master Your branch is ahead of 'origin/master' by 6 commits. (use "git push" to publish your local commits)

Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: Channel.cpp modified: Channel.hpp modified: Member.cpp modified: command/JoinCommand.cpp modified: command/PartCommand.cpp

Untracked files: (use "git add ..." to include in what will be committed) main_server.sh server server.dSYM/ sub_server.sh

no changes added to commit (use "git add" and/or "git commit -a") ➜ ft_irc git:(master) ✗ git *.cpp git: 'Channel.cpp' is not a git command. See 'git --help'. ➜ ft_irc git:(master) ✗ git add *.cpp ➜ ft_irc git:(master) ✗ git add *.hpp ➜ ft_irc git:(master) ✗ git commit -m "Fix Join Part" [master b887f1c] Fix Join Part Committer: Hangyeol Na hna@c2r2s5.42seoul.kr Your name and email address were configured automatically based on your username and hostname. Please check that they are accurate. You can suppress this message by setting them explicitly:

git config --global user.name "Your Name"
git config --global user.email you@example.com

After doing this, you may fix the identity used for this commit with:

git commit --amend --reset-author

3 files changed, 14 insertions(+), 13 deletions(-) ➜ ft_irc git:(master) ✗ git push Enumerating objects: 21, done. Counting objects: 100% (18/18), done. Delta compression using up to 6 threads Compressing objects: 100% (11/11), done. Writing objects: 100% (11/11), 1.16 KiB | 1.16 MiB/s, done. Total 11 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8), completed with 6 local objects. To https://github.com/HanGyeolN/ft_irc.git 408aac8..b887f1c master -> master`