I am running SourceTree 3.1.3 on Windows 10. For some reason it has started thinking that my develop branch is a Feature branch. I can't create new features and am doubtful of "ending" the develop branch just to try creating a new one. Is there a way to fix this?
Open main folder of your project, enable Hidden items (under View options of Windows folder) then go to .git folder and open 'config' file and make sure that your gitflow prefixes look like this:
[gitflow "prefix"]
feature = feature/
bugfix = bugfix/
release = release/
hotfix = hotfix/
support = support/
versiontag =
Restart Sourcetree and it should work.
Related
I have a folder in which I have a couple of dozens of sub-folders, each with it's own project versioned with git, something like this:
projects:
project_a
project_b
...
project_z
I would like to add them all in a SourceTree in some folder.
In OSX version there is a way to do that, but I cannot find how to do it in Windows version (I have version 3.1.2 installed if it matters).
Do anybody know how to add all repositories from a given folder into SourceTree at once?
You can select all the folders and just drag them into the Local Repos tab in a New Tab. It should just add all of the repos
I have successfully created a git hub repository, a local master, committed the initial changes and pushed them to github.
Unfortunately the project folder from Eclipse ends up in the repository. For example:
<username>/<gitrepositoryname>/<eclipse project folder>/<project files & README>
when for most people it looks like:
<username>/<gitrepositoryname>/<project files & README>
I created a new local master after I found this tutorial Push eclipse project to GitHub with EGit
but now I am running into push problems such as "HEAD rejected - non-fast-forward" when using the new local master.
Can some please help me to correct this locally/remotely? Is there a way to switch local master branches so that I can sync the correct one with githib?
Thanks in advance.
It's pretty simple to fix:
Go to the "workspace" where you keep <eclipse project folder>
Make sure to delete the .git folder there
Tell git to force push the changes. (Checkbox) (It's usually not good to force git to do something, because you could loose commits/data BUT here, we really want to overwrite the old repository with the new one.)
Your changes should be up immediately. Next time you push, please make sure, the force push checkbox is disabled again
I downloaded and installed the Mars Eclipse a couple days ago.
When I was working on branches, I've noticed that they are the same...
This is what I'm doing:
I create a new branch "test" and change some files in it. When I switch to branch "master" files are the same like in branch "test".
Does anyone know how to fix it? :)
If you added and committed the changes to your branch, and the files look the same in Eclipse, you just need to refresh your view using F5 or right click on your project and hit 'Refresh'.
If you did not add and commit your changes, then the given behavior is expected.
I'm new to SCM and I've managed to create and use a repository for an existing project. By following a variety of posts, I've done the following:
1) Created an account on Assembla
2) Used bash/git in my existing project directory to add, commit, and push the project
3) Used Source Control in XCode to pull, modify, commit, and push changes
Now I want to start a new projection Xcode, and it seems I have to go through the same steps, using a mixture of Xcode 4.2 and bash commands to get the new project into Assembla.
For example, I created a new space on Assembla "newjunk", started a new project in Xcode "newjunk" and did NOT check "create local git repository". I did not run any bash/git commands. In Xcode I cannot "push" because I did not "commit", and I can't "commit" because "no valid working copies were found".
Is this the only way to get a new project into a remote repository?
Or can it all be done from within Xcode, and if so how?
EDIT: Note - I've tried these steps (modified for Assembla and Xcode 4.2) http://www.mindthe.net/devices/2011/04/28/12-steps-to-using-github-with-xcode-4/ which is how I got the "no valid..." message
This helped me a lot
http://helpdesk.assembla.com/customer/portal/articles/678953-setting-up-git-on-windows
I preffered using TortoiseGit
I can load, build and run my app with no errors in XCode 4, apart from Git integration that is!
If I select the master branch and create a new branch and either auto switch or manually switch to the new brach XCode 4 hangs and eventually crashes.
Than when I try to re-open my project it is corrupt! Lucky I backed it up.
Has anyone else ha this issue? Thinking I may stick to console git mode!
Any help gratefully received ;-)
OK:
removed git
removed xcode4
installed git
installed xcode4
opened project
in organiser the repositories are there again...cool
select master
create new branch
switch to new branch
activity indicator just spins and spins and spins?
click anywhere else in organiser....crash!
BUT....
open terminal window and git operates as usual add, commit, diff etc, all ok???
For now my experience with Xcode 4 tells me that anything that doesn't work is most probably the bug. So your best bet is to submit the bug report directly to Apple.
Try deleting the build directory and reopenning the project.
That fixed this problem for me.