|
Coding_study
Search posts...
Internal Traffic (traffic_type=internal)
Accessed from the dashboard.
This session is not logged.
Git/Github
[Git 협업] 머지 충돌 해결하기
yuzu sim
Mar 29, 2024
Share
1. 머지 충돌났어….
2. 리퀘스트 클릭
내가 수정 한 거 확인 클릭!!!
크리에잇 풀 리퀘스트 클릭!!!
브랜치에 충돌 되었으니 해결해라!!!
수정해또…
됐어!!!!
pr 요청
Share article
Share
More articles
See more posts
sqldeveloper 테이블 생성
July 31, 2024
git pull이 안먹힐 때
March 30, 2024
[Git 협업] 메인에서 브랜치 머지(충돌0)
March 28, 2024
[Git 협업] 직접 Pull Requeset 요청
March 1, 2024
Coding_study
RSS
·
Powered by Inblog
![[Git 협업] 머지 충돌 해결하기](https://image.inblog.dev?url=https%3A%2F%2Finblog.ai%2Fapi%2Fog%3Ftitle%3D%255BGit%2520%25ED%2598%2591%25EC%2597%2585%255D%2520%25EB%25A8%25B8%25EC%25A7%2580%2520%25EC%25B6%25A9%25EB%258F%258C%2520%25ED%2595%25B4%25EA%25B2%25B0%25ED%2595%2598%25EA%25B8%25B0%26logoUrl%3Dhttps%253A%252F%252Finblog.ai%252Finblog_logo.png%26blogTitle%3DCoding_study&w=2048&q=75){kind=logo}
![[Git 협업] 메인에서 브랜치 머지(충돌0)](https://image.inblog.dev?url=https%3A%2F%2Finblog.ai%2Fapi%2Fog%3Ftitle%3D%255BGit%2520%25ED%2598%2591%25EC%2597%2585%255D%2520%25EB%25A9%2594%25EC%259D%25B8%25EC%2597%2590%25EC%2584%259C%2520%25EB%25B8%258C%25EB%259E%259C%25EC%25B9%2598%2520%25EB%25A8%25B8%25EC%25A7%2580%28%25EC%25B6%25A9%25EB%258F%258C0%29%26logoUrl%3Dhttps%253A%252F%252Finblog.ai%252Finblog_logo.png%26blogTitle%3DCoding_study&w=750&q=75){kind=logo}
![[Git 협업] 직접 Pull Requeset 요청](https://image.inblog.dev?url=https%3A%2F%2Finblog.ai%2Fapi%2Fog%3Ftitle%3D%255BGit%2520%25ED%2598%2591%25EC%2597%2585%255D%2520%25EC%25A7%2581%25EC%25A0%2591%2520Pull%2520Requeset%2520%25EC%259A%2594%25EC%25B2%25AD%26logoUrl%3Dhttps%253A%252F%252Finblog.ai%252Finblog_logo.png%26blogTitle%3DCoding_study&w=750&q=75){kind=logo}