version control - Why does git am leave modified files lying around? How can I adapt my workflow to do better? -


It will be too long, but I hope you can bear with me.

I am trying to use git to keep the source code of my team under version control after trying to find different ways of working for me, finally i feature. FWID, the product is an ASP.NET web application running in Windows and I am currently using msysgit .

Background:
I have a staging server (mirror output server) that contains all ASPX files. Then I have the init-db < / Em> and created a git repo and git add to track all the files. done

To create a local copy on my laptop, I have actually zipped the ".git" folder to the staging server and FTP has put it on my local machine in "staging.git" To change my development and against it, I did GIT clone staging.git webappfolder .

After committing 2 to feature 1 and feature 2, it's time to implement the change back to the staging server I have done a git format-patch-2 Outputs to 0001blah.patch and 0002blah.patch .

These 2 patch files are then sent to the staging server and I have done the git am 0001blah.patch on the staging server, showing a logging GIT That went through committed but when I do a git status , it displays , but has not been updated: modified: file1.aspx .

What does this mean? I have also tried to apply on git 0001blah.patch but all I had a error "patch was failed: file1.aspx: patch does not apply .

Is there a problem in my workflow? Any information about the proper or helpful information will be very useful. Then, the patching model will be most viable for us now because we will not establish an SSH server at any time.

I just Of Trials: 

  rm -rf clone? # Clone 1 is copy of work mkdir clone1 (cd clone 1 git init echo foo & gt; file1 git add file1 git commit -m "initial state" ) # Clone 2 Staging Repos GIT Clone Clone 1 Clone 2 # Patch (CD Clone 1 GIT Tag Staging # What is Tag Tagging in the tagging Icho feature1 & gt; file1 git add file1 git commit -m "feature 1" echo feature 2 & Gt; file1 git add file1 git commit -m "feature2" rm * .patch git format-patch taging) #define patches (cd clone 2 git am ../clone1/*.patch # Cygwin / msysgit line Weirdness on the end B Patching cancellation and re-implementing it clears Git am --abort git am ../clone1/*.patch git log git position)

minor issue with patches Not done twice without clearly speaking, but with the right content of the end file 1, with a clean drink in Clone 2, nothing looks wrong in your workflow.

Git apply only to update work trees, do not commit.

He said, do not use the GIT repository for staging. My workflow will probably create a release branch / fork of the development repository (or not), and will only deploy its complete clean copies.

For incremental updates in the staging environment, simply use GIT tag staging in the release bracket, email "git diff staging..HEAD> update.patch", and standard unix "patch -P1 "to implement it Should Ary. It is as long as you do not actually need a change history on the staging server.


Comments

Post a Comment

Popular posts from this blog

python - Overriding the save method in Django ModelForm -

I'm having trouble overriding a ModelForm save method. I get this error I'm: Exception type: TypeErier Exception Value: Save () found an unexpected keyword argument 'committed' My intentions include a form 3 fields Submit several values ​​for, then create an object for each combination of those areas, and to save each object file models.py class collarsult type (models.Model): id = model. AutoField (db_column = 'icontact_result_code_type_id', primary_key = true) callResult = models.ForeignKey ( 'CallResult', db_column = 'icontact_result_code_id') campaign = models.ForeignKey ( 'campaign', db_column = 'icampaign_id') CALLTYPE = models.ForeignKey ( 'CALLTYPE', db_column = 'icall_type_id') agent = models.BooleanField (db_column = 'bagent', default = true) teamLeader = models.BooleanField (db_column = 'bTeamLeader', default = true) active = models.BooleanField (db_column = Django.form...
Read more

html - CSS autoheight, but fit content to height of div -

I have a div in which there are three children- div in the left and middle div: float: left while true: float: true because it is my layout Actually will spoil, I've used ClearFix Hack: .cf {zoom: 1; }. Cf: First,. Cf: {content: ""; Display: Table; }. Cf: After {clear: both; } It still works, but I want to be the right div an indicator. So it should fill 100% of the parent unit of height. How can I complete this? PS is the full code: & Lt; / Div & gt; & Lt; Div class = "mobile_content" & gt; & Lt; H5 & gt; {{Data.titel}} & lt; / H5> & Lt; Table & gt; & Lt; TR & gt; & Lt; Th & gt; Komponist: & lt; / Th & gt; & Lt; TD & gt; {{Data.komponist}} & lt; / TD & gt; & Lt; / TR & gt; & Lt; TR & gt; & Lt; Th & gt; Instrument: & lt; / Th & gt; & Lt; TD & gt; {{Data.instrumente}} & lt; / TD & gt; & Lt; / TR & gt;...
Read more

qt - How to prevent QAudioInput from automatically boosting the master volume to 100%? -

I have been trying to use Qt5 multimedia to record audio with QAudioInput, however, when I see If QAudioInput is started, it increases the master volume of my sound device to 100%. How can I prevent QAudioInput from changing the master volume? My current development platform is Linux with PalsAdio (with flat audio disabled). How can I use QAudioInput : QAudioDeviceInfo device_info = QAudioDeviceInfo :: defaultInputDevice (); QAudio format format; Format.setSampleRate (44100); Format.setChannelCount (1); Format.setSampleSize (16); Format.setCodec ("Audio / PCM"); Format.setSampleType (QAudioFormat :: SignedInt); Format.setByteOrder (QAudioFormat :: LittleEndian); Std :: cout & lt; & Lt; Device_info.deviceName (). ToUtf8 (). ConstData () & lt; & Lt; Std :: endl; QAudioInput * default_device = new QAudioInput (device_info, format); QIODevice * default_io_device = default_device-> Start (); a QAudioInput.setVolume () method is not you I ...
Read more