version-control

问题 I am looking for a way to put an end to "holy wars" about "the only right code formatting for all people". Currently, most companies have its own code-style (expressed as, for example, .clang-format ), but obviously people have different mindsets/tastes/views on how the ideal formatting should look like. My idea is based upon the fact that it is only important to push my code in central repo in the format of a company, while nobody prevents me from having and working with code that is

问题 I am starting to use Mercurial: 1.) I pulled the latest updates from public (central) repository (revision 3029) 2.) Working on code, I made a commit - revision 3030 3.) Some additional work, and - I made another commit 3031. So, both of my commits 3030 and 3031 are in a local repository. At this stage my local repo looks like this There are no commits by other people in Central repository. I am finished at this point, and submit the code for code review - my reviewer tells me that there

问题 I am starting to use Mercurial: 1.) I pulled the latest updates from public (central) repository (revision 3029) 2.) Working on code, I made a commit - revision 3030 3.) Some additional work, and - I made another commit 3031. So, both of my commits 3030 and 3031 are in a local repository. At this stage my local repo looks like this There are no commits by other people in Central repository. I am finished at this point, and submit the code for code review - my reviewer tells me that there

问题 It's the second time this happens, when I'm doing a merge I later realized some files that were in the branch being merged are no longer in the branch being merged to. The latest example is we have a feature branch which I've been merging the changes in from the main dev branch, we lost a lot of files after a merge and they are not present in the feature branch now. Why does this happen? What's the best way to get these files? I'm thinking of manually adding them. here is a description of the

问题 It's the second time this happens, when I'm doing a merge I later realized some files that were in the branch being merged are no longer in the branch being merged to. The latest example is we have a feature branch which I've been merging the changes in from the main dev branch, we lost a lot of files after a merge and they are not present in the feature branch now. Why does this happen? What's the best way to get these files? I'm thinking of manually adding them. here is a description of the

问题 It's the second time this happens, when I'm doing a merge I later realized some files that were in the branch being merged are no longer in the branch being merged to. The latest example is we have a feature branch which I've been merging the changes in from the main dev branch, we lost a lot of files after a merge and they are not present in the feature branch now. Why does this happen? What's the best way to get these files? I'm thinking of manually adding them. here is a description of the

问题 It's the second time this happens, when I'm doing a merge I later realized some files that were in the branch being merged are no longer in the branch being merged to. The latest example is we have a feature branch which I've been merging the changes in from the main dev branch, we lost a lot of files after a merge and they are not present in the feature branch now. Why does this happen? What's the best way to get these files? I'm thinking of manually adding them. here is a description of the

问题 I have an iPad app (XCode 5, iOS 7, Git source control and Storyboards). I have two (2) branches I'm currently working on (1.8.1 in the App Store, and 2.0.0 as the working copy). I made a slight change to 1.8.1 for the next release and thought XCode's source control would automatically merge the changes into 2.0.0. I guess I was wrong. So I attempted to do the merge using XCode's source control, and that's where things went downhill... it went into a loop. So, I killed XCode, and restarted it

问题 I have an iPad app (XCode 5, iOS 7, Git source control and Storyboards). I have two (2) branches I'm currently working on (1.8.1 in the App Store, and 2.0.0 as the working copy). I made a slight change to 1.8.1 for the next release and thought XCode's source control would automatically merge the changes into 2.0.0. I guess I was wrong. So I attempted to do the merge using XCode's source control, and that's where things went downhill... it went into a loop. So, I killed XCode, and restarted it

问题 I have an iPad app (XCode 5, iOS 7, Git source control and Storyboards). I have two (2) branches I'm currently working on (1.8.1 in the App Store, and 2.0.0 as the working copy). I made a slight change to 1.8.1 for the next release and thought XCode's source control would automatically merge the changes into 2.0.0. I guess I was wrong. So I attempted to do the merge using XCode's source control, and that's where things went downhill... it went into a loop. So, I killed XCode, and restarted it