git - Is there a way to remove commits from one branch and place them into another? -

git - Is there a way to remove commits from one branch and place them into another? -

I made a mistake and mistakenly tried to master for a while, and now I realize my mistake It is, I want to move those people back to the master and go back to their own staging branch.

Is it possible, what to do with GIT or do I manually move files manually?

If your mistakes are those that currently look like a master:

  A-> B->; C- & gt; D    and you just want to move  c  and  D  to a new branch, it is very easy:   $ git Checkout Master # D $ transfer to GIT Branch New branch # D $ GIT Reset to create new branch B-SA1 # Reset Master B $ GIT Checkout continues to work on new branch # Based on the changes made by New-branch   
  C  and  D , this does not work properly Can, for example, if  is the C-class  introduces a new file, Git You may not checkout the new branch because of the fear of overwriting the file. (When the master is checked out on  B , the guitar thinks that the file has been untracked.) You can add a  git clean -xdf  after reset Are, or reset to  - depending on the circumstances.


















Get link





Facebook





X





Pinterest





Email





Other Apps




Comments





Post a Comment







Popular Posts




apache - How to do an URL rewrite that works with a
pre-existing .htaccess file? -



    I have a platform that is currently available through the URL:    Www.websitecom / index.php? App = forum    Instead, I want people to be able to go here:      & lt; Ifmodule mod_rewrite.c & gt; Option - Multi Views RewriteEngine RewriteBase / RewriteCond on% {REQUEST_FILENAME}! -f Rewrite Convert% {REQUEST_FILENAME}! -d rewriteable /index.php [L] & lt; / IfModule & gt;    It seems that it should be possible, but I'm not sure how to do it.   Thank you!      This has not been tested, but something like that should be done. Add it before the first Rev.Directivity.    RewriteRule ^ forum $ /index.php?app=forums    Alternatively, you redirect from a 301 / forum to index.php URL .   By doing this:    301 / redirect the forum "http://www.website.com/index.php?app = forum    However, it seems that you want to make a proper rewrite, so the first option is better,     






c# - EventSource's response has a MIME type ("text/html") that is
not "text/event-stream" -



    When I try to hook my controller to EventSource, it keeps saying:    EventSource Response contains a MIME type ("text / html") that is not "text / event-stream" canceling connection.    I have created the following class to help in handling a handle and preparing the reaction. In this class I believe that I set the  text / event-stream  according to the response.    public class ServerSentEventResult: ActionResult {public representative string GetContent (); Public GetContent Content {get; Set; } Public int version {get; Set; } Public Override Zero ExecuteResult (Controller Context Reference) {if (context == null) {New argument NullException ("Reference"); } If (this. Content! = Null) {HTPRPPointbase response = reference. Hpptntx response; reaction. Contact type = "text / event-stream"; reaction. BufferOutput = false; reaction. Chargset = Faucet; String [] newStrings = context.HttpContext.Request.Headers.GetValues ("last-event-id"...






android - How to build apk without eclipse or Modify the apk building
with a config file? -



    I want to create an APK with some big configurations with an XML file.  I want to know if there is any method which can control the APK's building process or encoding at our source, there is no way to create APK with our source from our source, with a slight variation based on our SQF XML file. . Or any other way to create an APK file    When the app is running, I do not want to read my config file every time, I have to include a change in the application        If you want to manually create your application:    If you are developing in Eclipse, then the ADT plugin The enhanced project as you make changes to the source code. Eclipse automatically produces an .apk file in the project's bin folder, so you do not need to do anything extra to generate .apk.   If you are developing in a non-eclipse environment, then you create your project with the Generated Build.xml Ant file in the project directory that creates ant file calls which automatically targets you for Call the buil...








Powered by Blogger