I've only just started to use GIT and think its wonderful, however I'm a little confused over what the merge command does.
Let us say we have a working project in the branch "A".
I go home and make changes to this branch and save it as "B". Another programmer makes changes to "A" and saves it as "C".
Is there a way to merge the two branches "B" and "C" together, then commit the changes as a new branch, say "D"?
Or am missing the point of 'merge'?
If you want to merge changes in SubBranch to MainBranch
git checkout MainBranchgit merge SubBranchCase: If you need to ignore the merge commit created by default, follow these steps.
Say, a new feature branch is checked out from master having 2 commits already,
Checkout a new feature_branch
Feature branch then adds two commits-->
Now if you want to merge feature_branch changes to master, Do git merge feature_branch sitting on the master.
This will add all commits into master branch (4 in master + 2 in feature_branch = total 6) + an extra merge commit something like 'Merge branch 'feature_branch'' as the master is diverged.
If you really need to ignore these commits (those made in FB) and add the whole changes made in feature_branch as a single commit like 'Integrated feature branch changes into master', Run git merge feature_merge --no-commit.
With --no-commit, it perform the merge and stop just before creating a merge commit, We will have all the added changes in feature branch now in master and get a chance to create a new commit as our own.
Read here for more : https://git-scm.com/docs/git-merge
To change your subBranch to main
git branch -m main <BRANCH>;
git fetch origin;
git branch -u origin/<BRANCH> <BRANCH>;
git remote set-head origin -a