티스토리 뷰

Git

Github- "1 commit behind master"

minsu20 2022. 11. 27. 17:37

Github branch에서 1 commit behind master여서 pull request를 했는데 이제는 1 commit ahead master가 되었다.

흠??

 

What I can do to resolve "1 commit behind master"?

After pushing I've been seeing this message at remote repository: 1 commit behind master. This merge has conflicts that must be resolved before it can be committed. To manually merge these changes...

stackoverflow.com

stackOverflow~ 믿고 있었다구~~

mater가 minsu인 상태에서 우선

git checkout master (you are switching your branch to master)
git pull 
git checkout yourBranch (switch back to your branch)
git merge master

충돌이 일어나지 않으면

git push

충돌이 일어나면 

git add yourFile(s)
git commit -m 'updating my branch'
git push

 

룰루 해결 완료~~