Questions tagged as 'branch'

Tagged questions
2
answers

What is the meaning of branch, tag, and trunk?

What do they mean and what are the best practices for using them?     
asked by 11.06.2014 / 19:52
2
answers

How to "synchronize" a branch with master before working on it?

I have the following situation: I have a Git repository, and at one point I created a branch from master. I did not do much in this branch at the time, and then I made the master branch for several commits, and the code changed a lot. Now I n...
asked by 18.07.2016 / 15:33
3
answers

Move folder / files between repositories without losing Change history

   Context:   I have a versioning environment in Mercurial using TortoiseHG for viewing and commits and files. I want to move a folder from one repository to another and without losing the change history , I would like to know if it is pos...
asked by 09.10.2015 / 17:15
1
answer

How to manage a project with several variations?

How do you manage the development of an application that is replicated to multiple clients? My scenario: One web application and 2 apps (1 for iOS and 1 for Android). For each client the base (master) is reused and specific resources...
asked by 30.03.2016 / 22:56
1
answer

GIT Change branch without committing or discarding current changes

I need to send my current changes to another branch. When giving git checkout branch-name it asks me to commit or change the current changes, I do not want any of these options. How can I proceed?     
asked by 18.05.2017 / 22:44
2
answers

How to replicate master upgrade to branches in Team Foundation Server?

I'm working on a project that has 3 branches . After some time the team saw the need to change the error handling, which is common among the 3 branches . Is there any way to change the master and replicate this change to branches ?     
asked by 13.10.2017 / 17:17
2
answers

How important is the branch in versioning?

Why creating branches are important in software versioning, rather than using only the master (in large, medium, small, or even personal applications)? What advantages do I have in using them? A versioning without them can lead to some "evi...
asked by 11.02.2018 / 01:05
2
answers

Best practice for dealing with branch sets in SVN

Here in the company we use SVN for versioning. We have the TRUNK that is available for homologation before going to production and generate a TAG, and we also have BRANCHS that symbolize each demand. Until a certain time ago, each completed BRAN...
asked by 08.10.2015 / 22:19
1
answer

I am not able to complete the merge this error always appears:

fatal: Exiting because of an unresolved conflict. U course-git-blog-project When I made the merge of a branch, it conflicted with the code that was in the master branch. I fix the code in hand, saved the index.html but I can not get out...
asked by 06.07.2018 / 00:19
1
answer

Error downloading branch in git

I was working on a branch on my personal machine, and when I downloaded it to the company machine, using the windows power shell, I received the following message: PS projeto> git checkout -t origin/minha_branch fatal: Cannot update paths a...
asked by 08.06.2017 / 16:02