branching-and-merging

问题 I'm working on a (Django) website with two branches: master and dev . master is the production version and no work should be done here directly. All the changes should come from merging dev branch, once it is considered to be stable. dev , as you may guess, is the development branch and all the changes are made here (and subbranches). In the server I have two websites working, the production one (uses master branch) and another private for development, with dev subdomain that uses dev branch.

问题 Our University provides web hosting to campus departments on servers we manage. Installing open-source third-party programs requires modifying file permissions and code in the program before it will run. (We're using suEXEC, if you're familiar.) We currently offer WordPress via an installer script. The user uploads the newest stable release, and runs a server-side PHP script via SSH. This PHP script modifies file permissions of all files/folders, adds/removes some code in various files, and

问题 When i make some changes to a branch and try switching to the master branch I keep getting this error: The following untracked working tree files would be overwritten by checkout The solutions on this thread dont work: The following untracked working tree files would be overwritten by checkout 回答1: My guess as to what is causing this error is that the files listed in your error are untracked in your current searchPlus branch, but they are tracked in your master branch. If Git were to checkout

问题 Background: We have our source code saved in an SVN repository at our own server. We have Team A working on the main functionality of the website. We are looking to work with a Team B on the design aspects which will be at a different location. A long time back when setting up the SVN repository, I created it with a structure which was finally accessible at: svn://www.myserver.com/main/abc The source code files are present at the 'abc' level and in folders below that. This has been working

问题 Implemented git branching model as shown below http://nvie.com/posts/a-successful-git-branching-model/ But my branch develop and master gets diverged after these steps Step 1 : merge release into master ( no fast forward) Step 2 : merge release into develop ( no fast forward) since merge commit from step 1 will not be available for step 2 , develop and master gets diverged. How to ensure develop and master does not gets diverged. ? 回答1: The git-flow model naturally makes develop and master

问题 I am in an "internal" IT shop and we currently use ClearCase for version management. Our branching strategy is common for this with the main branch being reserved for live code and branching off main for project and hotfix type activities. Each project (and they overlap often) has a branch off main, we don't have multitiered branching. We get the situation were we have to do merging between integration branches so that the release 4 branch picks up all of the release 3 changes (for example)

问题 I've got a situation that I'm not sure if I can work around. I've recently started on a new team that had never used any type of Version Control system, and our organization uses TFS as a standard (which I'd never used before). After a lot of pleadind, I got the admins to creat a TFS project for my existing code on our server, and since none of my project's code had ever been checked in (after many years of existence), I wanted it in version control asap, so I checked my project into the root

问题 I understand that this a very noob problem, but when I try to create a new branch from already present branch (not trunk) with the command : svn copy svn+ssh://svn.example.com/software/branches/branch_name svn+ssh://svn.example.com/software/branches/new_branch_name -m "Message" I get the following error : svn: No repository found in 'svn+ssh://svn.example.com/software/branches' I have checked again and again, the directory is correct. I don't understand why this is happening. 回答1: Ahh finally

问题 A colleague, whom we'll call Aaron, was assigned to renovate a section of a website as a long-term project. He created a new Git branch, called aaron . All his changes were made on this branch. While he was working, I continued to maintain the site as a whole, committing my changes to master . Eventually, Aaron merged his branch into master . This somehow reverted all of the commits I'd made to master between the time of the merge and the time when the aaron branch was first created. If I

问题 I would like to know if it's better to delete your branch after merging to master or if we should continue to work on the same separate branch during all the project. i.e If we are 3 members in the group, each of us create his own branch and works on it during the duration of the project. We all commit in the master branch and pull before we start working on something else. In that way, we know who's working on which branch and we don't get confuse. Thanks. 回答1: So there are tons of