Skip to main content
removed u flag for github cli
Source Link
shahul01
  • 385
  • 5
  • 12

I took this code from thenetninja youtube channel and it works for me.

on non master branch

 git add . git commit -m "msg" git checkout master 

on master branch

 git merge <non master branch name> # fix any conflicts and try to run the software to test any error git add . # commit w/o any msg, as follows git commit git push -u origin master 

I took this code from thenetninja youtube channel and it works for me.

on non master branch

 git add . git commit -m "msg" git checkout master 

on master branch

 git merge <non master branch name> # fix any conflicts and try to run the software to test any error git add . # commit w/o any msg, as follows git commit git push -u origin master 

I took this code from thenetninja youtube channel and it works for me.

on non master branch

 git add . git commit -m "msg" git checkout master 

on master branch

 git merge <non master branch name> # fix any conflicts and try to run the software to test any error git add . # commit w/o any msg, as follows git commit git push origin master 
Source Link
shahul01
  • 385
  • 5
  • 12

I took this code from thenetninja youtube channel and it works for me.

on non master branch

 git add . git commit -m "msg" git checkout master 

on master branch

 git merge <non master branch name> # fix any conflicts and try to run the software to test any error git add . # commit w/o any msg, as follows git commit git push -u origin master