Merging: when branches meet
You finished a feature on a separate branch. Now it is time to bring those changes into main. That process is called a merge. Depending on how main changed while you worked, Git picks one of two scenarios.
You finished a feature on a separate branch. Now it is time to bring those changes into main. That process is called a merge. Depending on how main changed while you worked, Git picks one of two scenarios.