Please see here: https://stackoverflow.com/a/549949/606723 You can rename the master branch trunk as Greg has suggested, or you can also create a trunk that is a symbolic reference to the master branch so that both git and svn users have the ‘main’ branch that they are used to. git symbolic-ref refs/heads/trunk refs/heads/master Note that trunk isn’t … Read more
Github has released a feature where anyone with admin permission to the repository can configure branches to get deleted automatically after pull requests are merged. Here are the steps – Navigate to main page of the repository and click on Settings. Under “Merge button”, you can select or unselect “Automatically delete head branches” option. This … Read more
WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or … Read more
You could start with: svn diff http://REPOS/trunk http://REPOS/branches/B (Where http://REPOS is your repository path including the parents of trunk and branches.) This will print a large quantity of text, including all the textual changes but not the binary changes except to say where and when they occurred.
If you have remote-tracking branches set up locally, it’s as simple as: git checkout production git merge development git push origin production If you have not yet set up remote-tracking branches, you could do something like: git fetch origin git checkout production # or `git checkout -b production origin/production` if you haven’t set up production … Read more
If you create a branch with the name <issue-number>-issue-description and push that branch to gitlab, it will automatically be linked to that issue. For instance, if you have an issue with id 654 and you create a branch with name 654-some-feature and push it to gitlab, it will be linked to issue 654. Gitlab will … Read more
I use the following script: git log main –first-parent –merges \ –pretty=format:”%h %<(10,trunc)%aN %C(white)%<(15)%ar%Creset %C(red bold)%<(15)%D%Creset %s” Explaining each argument: main: the name of your main branch. Can be omitted, in which case the current branch will be used. –first-parent: skips commits from merged branches. This removes the entries where someone merged master into their … Read more
No, git doesn’t support this at the same time. However, you can run the commands in a shell conditionally: git merge source-branch && git branch -d source-branch Edit: -d will only remove merged branches while -D will also remove unmerged branches, so -d will ensure that the branch is merged and you don’t delete a … Read more
I can’t really speak to the merits of the methods described in your post, but I can describe how we solved collaborative coding in the workflow we use at work. The workflow we use is one of many branches. Our structure is thus: Master is golden; only the merge master touches it (more on this … Read more
It is no longer in TortoiseSVN because Subversion 1.8 deprecated the –reintegrate option. Subversion 1.8 has automatic reintegration handling/detection. See: Subversion 1.8 release notes, specifically the auto-reintegrate section Here is the relevant area, for convenience: Automatic reintegration merge (–reintegrate option deprecated) During merges which merge all eligible revisions from another branch, Subversion 1.8 will automatically … Read more