Menu
im using netbeans with svn.
i've checked out a project and then i used "copy to..." and chose to copy the trunk to a branch. i deleted the working copy of the trunk and checked out the newly created branch into a working copy and made some changes both in the trunk and the branch.
now..how do i update the branch with the new data of the trunk and how do i merge the branch with the trunk using netbeans?
is this possible? cause with "merge to..." i could only chose to merge from a remote repository to a local folder.
331
To merge branches locally, use git checkout to switch to the branch you want to merge into. This branch is typically the main branch. Next, use git merge and specify the name of the other branch to bring into this branch. This example merges the jeff/feature1 branch into the main branch.
No, merging does only affect one branch.
Merging a branch multiple times into another works fine if there were changes to merge. Save this answer. Show activity on this post. Actually yes you totally can, when you merge again it will bring over any commits that don't exist on production.
Go Branches -> Local (or Remote, depending on which one you need to delete). Select the branch you want to delete, right click on it, and choose Delete option.
how do i update the branch with the new data of the trunk
Check out the branch
Merge the repository trunk into the checked out branch
commit the branch to the repository
how do i merge the branch with the trunk
Check out the trunk
Merge the repository branch into the checked out trunk
commit the trunk to the repository
You can't merge two repository projects in Netbeans without making local copies.
120
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
