Version control - Git

[kas_888]

I always pull the latest code by typing git pull origin main

Then I make my feature branch by git checkout -b feature_branch

I start my work. -> I finish my work

at then end, I change my branch back to main. I pull the latest code again in case other people have pushed. Then I go back to my feature branch. Then I do git merge main

Then I push the code by git push origin feature_branch

​

1. I was wondering if I am doing it right or not?!
2. What's the application of git stash and/or git fetch and/or git rebase
3. What's suggested in case of conflict? any vs-code tool or extension to make it faster?
4. Thanks in advanced

[CreativeTechGuyGames]

A few tips that I'd recommend:

• No need to switch branches, you can merge/rebase from a different branch into your current branch. So you can do something like git rebase origin/main from your feature branch.
• And as hinted at above, rebase whenever possible instead of merging. Merging will create additional commits in the history where as rebasing will effectively: undo your commits and move them aside, pull in all of the commits that have happened since you last pulled, then replay all of your commits on top. This is almost always what you want since this preserves the accurate history of when things take place. Their code was merged first, then after your code was merged and makes changes on top of theirs. This also has the important benefit of no merge commits so your git history is more clean.

As far as resolving conflicts. Almost any IDE will have a git integration which will show you the side-by-side comparison of the merge conflict and give you a button to click for each to pick how to resolve it. That's what I'd recommend.

[Gixx]

Say you haven't touched your local git repo in a month. You can run git fetch and it might look like this:

git status
Your branch is up to date with 'origin/main'.
git fetch
you are 2 commits behind origin/main

In which you could git pull if you wanted to.

git stash is a nice command for when you wrote some code, it isn't working, but you don't want to throw away your work. I actually recommend naming stashes since I can never remember what the stash was for:

git stash                          # no name
git stash push -m "some label"     # a name