Top "Branching-and-merging" questions

In version control, branches represent parallel lines of development.

What is the best (and safest) way to merge a Git branch into master?

A new branch from master is created, we call it test. There are several developers who either commit to master …

git git-branch git-merge branching-and-merging
Move the most recent commit(s) to a new branch with Git

I'd like to move the last several commits I've committed to master to a new branch and take master back …

git git-branch branching-and-merging
How to copy commits from one branch to another?

I've got two branches from my master: v2.1: (version 2) I've been working on for several months wss: that I created …

git branching-and-merging
How do I copy a version of a single file from one git branch to another?

I've got two branches that are fully merged together. However, after the merge is done, I realise that one file …

git git-branch branching-and-merging
How to resolve git's "not something we can merge" error

I just encountered a problem when merging a branch into master in git. First, I got the branch name by …

git branching-and-merging
Deleting an SVN branch

I created a branch of an SVN project called 'features', and now whenever I try to update said project, it …

svn version-control branching-and-merging
What I can do to resolve "1 commit behind master"?

After pushing I've been seeing this message at remote repository: 1 commit behind master. This merge has conflicts that must be …

git github bitbucket branching-and-merging git-merge-conflict
Remove large .pack file created by git

I checked a load of files in to a branch and merged and then had to remove them and now …

git branching-and-merging pack
Why am I merging "remote-tracking branch 'origin/develop' into develop"?

I'm the only one in my organization who's making commits with the following message: Merge remote-tracking branch 'origin/develop' into …

git branching-and-merging git-merge git-remote