>>103212206
you want to make a change to code?
git checkout -b descriptive-branch-name-of-intention-of-change-to-code
change code then
git status
to see what files have been changed. happy with your changes thus far?
git add file1 file2 file3
git commit
and enter a message describing your changes. if you are on Linux, the editor that is pulled up is based on your $EDITOR
environment variable. I use Neovim btw
do another
git status
to see that no files are marked as changed now, because you just commited your changes to the descriptive-branch-name-of-intention-of-change-to-code branch.
make as many more changes as you want and reperform the above steps to keep commiting changes.
when you are done and want to merge your changes into master:
git checkout master
git merge description-branch-name-of-intention-of-change-to-code
this will pull up your editor again. why? because you are effectively commiting the changes from the description-branch-name-of-intention-of-change-to-code branch into the master branch. write whatever you want, although I typically just leave it as the defaults.
if Git complains about merge conflicts, then search your codebase for >>>>
to find the conflicts and correct them, then rerun
git merge
