What would be the best workflow to do refactorings intermingled with new features in Git? -

-

I am using GIT as a source code management tool. << li>

  • Review the difference with the head
  • less

    • I have more workflow of this workflow The reason for this is that I have faced the situation after some time, which I think is a typical one:

    After being committed, I used to add a new working directory I'm starting to revise the feature.

    The code for a while, the status of the working directory should be one at this time. The important thing here is that state A is not a working directory ready, because the new feature has not yet been completed.

    At this time I realize that it will be better to do a refactoring than before. Accept this, sometimes the need for a refactoring in the process of code modification becomes clear.

    Now I have to start again from the head and refactoring first. But I do not want to lose code revision -> State A So basically I need it:

    • Refactoring in a copy of the work directory that has not yet changed Last commit
    • Earn it
    • I have merged the work on which I have started the new facility and when the working directory was in the state
    • Work on the full new feature
    • reduce it

    I believe that the branches can help me, but the correct GIT commands I am confused with the fact that I need to create a branch when the working directory is changed after taking revenge and I do not know how to deal with it properly .

    What is the correct way to describe the above workflow as per GIT orders?

    You want to hide the git when your working directory is in an intermediate state, which you commit If you are not, run some text to 'git stash' or 'git stash save', it will move your working directory back to the HEAD. Now make a change and commit. Then run 'GIT Landscaping Pop' and your previous intermediate work Will be merged into the working directory. Give them a list of 'GIT status list' ('some text' will identify them.) If you do not give a message, then the last committed log is used.)

    'Git add -patch' and git add '--interactive' P>


    Comments

    Post a Comment

    Popular posts from this blog

    c# - ListView onScroll event -

    -
    I am programming a simple C # application, and I need a Scallow event on the list view. So I inherited the original ListView class created in ListviewEx witch. I found out how to locate the scroll message from WinAPI and I modified the WndProc method. Now I have this WndProc: protected override zero WndProc (Ref message message) {base.WndProc (Ref I); If (m.msg == WM_VSCROLL) {onScroll (This, New EventArgs ()); }} But the problem is, I do not know how to know about scrolling information. This data should be in wParam, but there is a LOWORD macro ++ like in C in C # and I switch to find the criteria like SB_ below, SB_ENDSCROLL, SB_PAGEUP etc. there any way Need to change the LOWORD macro from C #? Or any other way to find the necessary parameters about scrolling? You can define the WParam constants as the following: Private const int WM_HSCROLL = 0x114; Private Constant WM_VSCROLL = 0x115; Private contact int SBHOZZ = 0; Private Consultant SB_VERT = 1; Private Con...
    Read more

    PHP - get image from byte array -

    -
    I am trying to create a back-end for my mobile application. I am sending the content of an image in the body of the HTTP request (output stream) as a byte array, I want to read this stream of bytes in PHP scripts and take back an image. Can anyone tell me how can I do this? Thank you. You can obtain the request body $ body = Reading from file_get_contents ('php: // input'); What you do with that data Depending on you, you can write the data in a file as you mentioned that this is image data, you can drop the data into the object can do. Another option is to use and load the image.
    Read more

    Linux Terminal Problem with Non-Canonical Terminal I/O app -

    -
    I have a small app written in C to run on Linux. Part of the app accepts user-input from keyboard , And it uses non-canonical terminal mode so that it can respond to each keystroke. The section of the code that accepts input is a simple task that is called repeatedly in the loop: char get_input () {char C = 0; Int res = reading (input_tamille, & amp; c, 1); If (RSS == 0) 0 returns; If (res == -1) {/ * snip error handling * /} return c; } It reads a letter from the terminal if there is no input within a given time limit, (c_cc [VTIME] value in the vocabulary structure), read () 0 And get_input () is called again It all works very well, I have recently discovered that if you run this app in a terminal window, and then the app Close the terminal window without ending, the app will not exit Received, but CPU intensive launches into an infinite loop, where the read () returns 0 without waiting continued. So how can I get out of the apple if it runs from the terminal win...
    Read more