PS C:\Users\msk_0\Desktop\sparta\ggu> git branch
PS C:\Users\msk_0\Desktop\sparta\ggu> git branch
PS C:\Users\msk_0\Desktop\sparta\ggu> git status
On branch master
No commits yet
.idea/
templates/nothing added to commit but untracked files present (use "git add" to track)
PS C:\Users\msk_0\Desktop\sparta\ggu> git branch -M main
PS C:\Users\msk_0\Desktop\sparta\ggu> git add .
warning: in the working copy of '.idea/inspectionProfiles/profiles_settings.xml', LF will be replaced by CRLF the next time Git touches it
PS C:\Users\msk_0\Desktop\sparta\ggu> git commit -m "test"
[main (root-commit) a77675e] test
8 files changed, 305 insertions(+)
create mode 100644 .idea/.gitignore
create mode 100644 .idea/misc.xml
create mode 100644 .idea/teampase.iml
create mode 100644 .idea/vcs.xml
Writing objects: 100% (14/14), 3.87 KiB | 197.00 KiB/s, done.
Total 14 (delta 0), reused 0 (delta 0), pack-reused 0
To github.com:Seop0728/gittest02.git
- [new branch] main -> main
branch 'main' set up to track 'origin/main'.
PS C:\Users\msk_0\Desktop\sparta\ggu> git branch asdf
PS C:\Users\msk_0\Desktop\sparta\ggu> git branch
- asdf
main
PS C:\Users\msk_0\Desktop\sparta\ggu> git add .
PS C:\Users\msk_0\Desktop\sparta\ggu> git status
Changes to be committed:
(use "git restore --staged ..." to unstage)
PS C:\Users\msk_0\Desktop\sparta\ggu> git commit -m "asdf"
[asdf fc5c0d3] asdf
1 file changed, 1 insertion(+), 1 deletion(-)
PS C:\Users\msk_0\Desktop\sparta\ggu> git push -u origin asdf
Enumerating objects: 7, done.
Counting objects: 100% (7/7), done.
Delta compression using up to 8 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (4/4), 344 bytes | 114.00 KiB/s, done.
Total 4 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (2/2), completed with 2 local objects.
remote:
remote: Create a pull request for 'asdf' on GitHub by visiting:
remote:
To github.com:Seop0728/gittest02.git
- [new branch] asdf -> asdf
branch 'asdf' set up to track 'origin/asdf'.
PS C:\Users\msk_0\Desktop\sparta\ggu> git status
On branch asdf
Your branch is up to date with 'origin/asdf'.
Changes not staged for commit:
(use "git restore ..." to discard changes in working directory)
modified: templates/index.html
no changes added to commit (use "git add" and/or "git commit -a")
On branch asdf
Your branch is up to date with 'origin/asdf'.
PS C:\Users\msk_0\Desktop\sparta\ggu> git branch
- asdf
PS C:\Users\msk_0\Desktop\sparta\ggu> git add .
PS C:\Users\msk_0\Desktop\sparta\ggu> git commit -m "asdf11"
status
PS C:\Users\msk_0\Desktop\sparta\ggu> git status
Your branch is ahead of 'origin/asdf' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
PS C:\Users\msk_0\Desktop\sparta\ggu> git branch
main
PS C:\Users\msk_0\Desktop\sparta\ggu> git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
Auto-merging templates/index.html
CONFLICT (content): Merge conflict in templates/index.html
Automatic merge failed; fix conflicts and then commit the result.
PS C:\Users\msk_0\Desktop\sparta\ggu> git status
On branch asdf
(use "git push" to publish your local commits)
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
Unmerged paths:
(use "git add ..." to mark resolution)
PS C:\Users\msk_0\Desktop\sparta\ggu> add .
우 경로가 올바른지 검증한 다음 다시 시도하십시오.
위치 줄:1 문자:1
- add .
+ CategoryInfo : ObjectNotFound: (add:String) [], CommandNotFoundException + FullyQualifiedErrorId : CommandNotFoundException
PS C:\Users\msk_0\Desktop\sparta\ggu>
PS C:\Users\msk_0\Desktop\sparta\ggu> git add .
PS C:\Users\msk_0\Desktop\sparta\ggu> git commit -m "asdf2"
[asdf 5389df3] asdf2
PS C:\Users\msk_0\Desktop\sparta\ggu> git push
Enumerating objects: 14, done.
Counting objects: 100% (14/14), done.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (8/8), 659 bytes | 59.00 KiB/s, done.
remote: Resolving deltas: 100% (4/4), completed with 2 local objects.
To github.com:Seop0728/gittest02.git
fc5c0d3..5389df3 asdf -> asdf
PS C:\Users\msk_0\Desktop\sparta\ggu> git branch
main
PS C:\Users\msk_0\Desktop\sparta\ggu> git status
Your branch is up to date with 'origin/asdf'.
PS C:\Users\msk_0\Desktop\sparta\ggu> git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
PS C:\Users\msk_0\Desktop\sparta\ggu> git branch
asdf
Your branch is up to date with 'origin/asdf'.
PS C:\Users\msk_0\Desktop\sparta\ggu> git branch
- asdf
main
