I have a Git repository with many branches, some of them already merged and some not. Since the number of branches is quite large, how can I determine which branches have not yet been merged? I would like to avoid having to do an “octopus” merge and re-merging branches that have already been merged. 4 … Read more
I just encountered a problem when merging a branch into master in git. First, I got the branch name by running git ls-remote. Let’s call that branch “branch-name”. I then ran git merge branch-name command and got the following result: fatal: branch-name – not something we can merge How do I resolve this error? 31 … Read more
How do I create a branch in SVN? 10 s 10 Create a new branch using the svn copy command as follows: $ svn copy svn+ssh://host.example.com/repos/project/trunk \ svn+ssh://host.example.com/repos/project/branches/NAME_OF_BRANCH \ -m “Creating a branch of project”
I’ve got two branches from my master: v2.1: (version 2) I’ve been working on for several months wss: that I created yesterday to add one specific feature to my master (in production) Is there a way to copy yesterday’s commits from wss to v2.1? 1Best Answer 11 Use git cherry-pick <commit> to apply <commit> to … Read more
I’ve got two branches that are fully merged together. However, after the merge is done, I realise that one file has been messed up by the merge (someone else did an auto-format, gah), and it would just be easier to change to the new version in the other branch, and then reinsert my one line … Read more
A new branch from master is created, we call it test. There are several developers who either commit to master or create other branches and later merge into master. Let’s say work on test is taking several days and you want to continuously keep test updated with commits inside master. I would do git pull … Read more
I’d like to move the last several commits I’ve committed to master to a new branch and take master back to before those commits were made. Unfortunately, my Git-fu is not strong enough yet, any help? I.e. How can I go from this master A – B – C – D – E to this? … Read more