How do I change the development branch for my BitBucket repository? Right now my master branch is labeled as both the main and the development branch.
This is a near duplicate of this question: How to change the main branch in BitBucket? however, I couldn't find anything telling me how to change the label for the development label and since it is different enough, I thought it warranted its own post for anyone in the future looking for this answer. (the top answer there is pretty clear so I copied the format he used)
Repositories
Select repository
Click Repository settings (bottom of menu)
In the menu under WORKFLOW select Branching model
Should see a screen that looks like this at the top
Click the dropdown menu under Development branch and change it to Use specific branch.
After that you should be able to click the dropdown menu next to it and change it to whatever branch you want
Make sure to hit save at the bottom
After saving it might take like 30 seconds but when you go back to your branches they should now have the DEVELOPMENT label changed to the branch you specified
I do not know how to do this from the terminal.
Related
New user interface of bitbucket make me a little confuse. I just want to sync my repo from the parent repo. but I cant see any link of sync and compare button.
I have figured out the solution. It's true that bitbucket no longer provide sync link when there is any update from parent repo (master branch). So the remaining option is only by comparing. We can access the compare menu by choosing repo -> click plus button (on right side upper of the page) -> click Compare branches or tags.
Using VS2013 and/or VisualStudio.com, is it possible after creating a branch ("Main" branched to "Dev001") to view a list of all the files that differ between "Main" and "Dev001"?
For example, I'd like to see all the files that have been amended/created within the current branch, since it was branched.
The closest I have got is right-clicking the branch, selecting View History, then clicking each changeset to view the files in the Changeset Details panel, however, there are many changesets in there which is taking a long time.
Please note I am not using Git.
Just right click on your Main branch in Source Control Explorer an select Compare.... From there you can specify the path to your branch and the versions you would like to compare.
I started to set up the new Xcode service in Mavericks. I created a new bot - but I wasn't asked for the branch it should build?
How can I select the branch for each bot? I do not only want to build master, but different branches too.
In the current version, when you create the bot in Xcode, it will be linked to the currently active branch. You can easily verify (but not change) it from the web interface, when you navigate to the bot -> Bot settings (when you click the cog wheel in the upper right).
Alternatively you can create the bot via the web interface where you can specify the branch name plain-text.
Assuming you want to change it whenever you want and not recreate bots each time, you can use the script: (pre-trigger)
cd "$XCS_SOURCE_DIR/<repo name here>"
git checkout development
Just change it to whatever branch you want and whatever repo you want. (you can look in the pre trigger logs to see if you mess up the change directory, ie if you misspel the repo name or whatever else. Good luck!
Create a bot for each branch you are interested in testing.
You can create as many bots as you want. Each one will check out whatever branch you specify, and run per the schedule you set individually.
It seems like this is now possible (in Xcode 7.1). However, you only get the option your project actually has more than one branch (makes sense).
Simply as titled, I can't create Branches/Trunks/Tags for SVN although I am able to connect to the repo. In the screen where I enter the Trunks, Branches and so, it can't connect to them (showing red indicator). What am I doing wrong?
Go to Source Control->Project Name->COnfigure
Over there, select configuration and update the paths of trunk,
tags and branches.
Now along with info and configuration, you'll get branches option as well/
From there add a new branch and an auto switch to that branch will happen.
So, we have our main dev line, I create a branch, and developer b creates a branch. We both do some work. developer b finishes his work, merges back into the main dev line. I know his changes will affect me, and rather than deal with the conflicts later, I would like to update my branch, with the changes that are now in the main dev line, so I can deal with them in my branch, prior to merging back into main.
How do I do that?
From Visual Studio, open Source Control Explorer:
View | Team Explorer
Select your Team Project from Team Explorer, expand it, and double click Source Control
In the left-hand pane of Source Control Explorer, select your Team Project.
In the right-hand pane, find your mainline branch, right-click and select Merge...
In the Target branch drop-down, select your dev branch.
If you want a subset of all the changes in the mainline:
Choose the Selected changesets radio button, click Next.
Select the changesets that represent the merge from your other dev's branch into main, click Next.
Otherwise, keep All changes up to a specific version selected, click Next
The next step has you pick a Version type. The default, Latest Version is obviously straightforward and self-explanatory: you would be brining all changes since your branch was created from the mainline down into your branch. The other choices are straightforward, but a tutorial explanation of each option available here would take a fair amount of space.
Walk through the remaining steps of the wizard.
Click Finish.
If there are any errors or merge conflicts, you will be prompted to resolve them, similar to what you would see if checking your changes into source control when other changes had been made since last checkout.
After the merge is done, all the changes are in your local copy of the branch, but they are not yet committed to source control. Once you've completed all your builds and testing on your branch, you can check in the merge. From Visual Studio:
View | Other WIndows | Pending Changes
Make sure all the files related to this merge are checked, add comments describing the merge, and click Check In.
I recommend keeping merges (and any necessary merge conflict resolution, build breaks, test breaks) as their own changeset. That is, do not mix other feature work with merges. Granular changesets make it much easier to review source control history, and to identify a single change of interest. Keeping merge work in its own changeset helps work toward that goal.
There is command-line for merging as well, run tf merge /? from a Visual Studio Command Prompt.