git pull from master into the development branch

The steps you listed will work, but there’s a longer way that gives you more options: The fetch command can be done at any point before the merge, i.e., you can swap the order of the fetch and the checkout, because fetch just goes over to the named remote (origin) and says to it: “gimme everything you have that I … Read more

What’s the difference between git switch and git checkout

Well, according to the documentation you link to, its sole purpose is to split and clarify the two different uses of git checkout: git switch can now be used to change branches, as git checkout <branchname> does git restore can be used to reset files to certain revisions, as git checkout –<path_to_file> does People are confused by these different ways to use git … Read more

How do I delete a local repository in git?

Delete the .git directory in the root-directory of your repository if you only want to delete the git-related information (branches, versions). If you want to delete everything (git-data, code, etc), just delete the whole directory. .git directories are hidden by default, so you’ll need to be able to view hidden files to delete it.

What is the difference between `git merge` and `git merge –no-ff`?

The –no-ff flag prevents git merge from executing a “fast-forward” if it detects that your current HEAD is an ancestor of the commit you’re trying to merge. A fast-forward is when, instead of constructing a merge commit, git just moves your branch pointer to point at the incoming commit. This commonly occurs when doing a git pull without any local changes. However, occasionally … Read more