![]() If I wait a few minutes between the start and end of a release then I havent seen this issue (yet). It appears that the delay in updating the remote seems to affect this. I think this happens when I do a start and end release too quickly. Then do the release again to close the process. But what I had to do is discard the deleted files form the unstaged area which luckily restores the local repository and then I have to manually finish the commit to the master. Unfortunately I didnt get a screen capture of it as I was in a rush to do a release for a customer. When it does fail, it switches to the master branch and (randomly?) marks some files from my repository in the unstaged file area as deleted. When I try and issue a release it sometimes but not always fails. I seem to be having some weird issues with SourceTree. Again sorry if this seems like a dumb question. I guess in my mind I am confused as to is why this is even an option given the Gitflow process of releases being pushed from the develop branch to the master branch. So since I am using GitFlow which created both branches remotely and I am assuming is also tracked locally, does leaving it mixed or checked do the same thing in this case? Just want to be sure. " You can have it mixed if you know the branch already exists on the remote and is tracked locally but we check the box just in case." I apologize in advance if these questions seem basic but git can get very confusing at times for the uninitiated. Shouldnt the files just be pushed to master branch automatically? What am I missing? And quite honestly from the Git_Flow branching model ( ) it looks like the master just holds all the latest files once the develop branch has been properly vetted. I am not sure why I need to do this extra step since I need files added anyway. I then have to go to the master and add the files and then issue the release. I dont know if this is right but whenever I do this, the release fails. My second question is about generating a release with new files in the Develop branch. Generating a release with new (added) files Would setting the option to "mixed" do the same thing? It seems logical but honestly this whole git thing can be confusing as hell so I don't want to mess up my repository by doing something I shouldn't.Ģ. Switch to the master and then push to the master. My question is why does it check it on the master? And how do I correctly push to both branches when finalizing a release? Right now I have to push to the develop. Mixed (-) = Don't change any tracking on this branch, leave it as-is Unchecked = Stop the local branch tracking anything ![]() ![]() However, if I were to choose to push to the master at the same time the track option changes to a checkmark as below.įrom another post I found this information.Ĭhecked = Set the remote branch to be the one the local branch should track The default choice for this tri-state button is always "mixed". Whenever I am on the Develop branch and use Git-Flow to Finish a release it prompts this dialog. The purpose of the Track option in the Push dialogĪs per the Git-Flow recommendation, I have two branches, Master and Develop. I am using SourceTree and Git-Flow and am wondering if someone could educate me on a few things.ġ.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |