merge - git abandon master branch -

-

In my git repository I have created a new branch called alt. After some work it seems that Alt is my master In the branch, I want to leave the master and I want to make a new master. 

  C1 | C2 / \ Master - & gt; C3C4 | C5 and LT; - alt   
 So I want to sacrifice C3, but still want to put it in the history committed for future reference and return to one branch. What is the best way to do this? 
 My first thought is to transfer the master from C5, and then to merge the Alt in the master. is this correct? Do I need to move the master first? 
 I can also merge master to Alt, solve all the merge tribs by placing the version of Alt, and then rename it to master Alt. 
 Or should I take the master to Alt and just remove the branch alt, leave the C3 as a fragmented branch, which is actually a reality? 
 I think there are many solutions here, there is a best practice to follow (always return branches to velvety vs open-ended)   
 
 
 I think the easiest way to merge the  ours  strategy to the owner, it creates a new comment C6, which is similar to the C5, -C3 and C5 in the form of a wife, thus keeping C3 in the repository.  
  git checkout alt git merge --strategy = remove our master # merge GIT checkout master GIT merge - alt alt # level master alt git branch -d alt # delete alt it is no longer necessary   
 Instead of merge, if you want a linear history, you should also be able to rebase. Just replace the first two rows with  git rebase --strategy = ours alt master .  
 Please enter each order that you enter. I have not tested this. Of course, git is going on, nothing is lost if something goes wrong ...

Comments

Post a Comment

Popular posts from this blog

java - ImportError: No module named py4j.java_gateway -

-
I'm trying to call the Python using the Java program py4j . I've been installing the plug-in Eclipse and test name Piidvi project. I'm trying to execute the following part of the code found on py4j webpage: Import from py4j.java_gateway to JavaGateway, java_import gateway = JavaGateway () jvm = gateway.jvm java_import (jvm, '' Org.eclipse Kkorkrisorsej. * ") Vrkspes_rut = Jvankresourkesplginkgetvrkspas (). GetRoot (Gateway .help (workspace_root, '* Projects *') project_names = [project.getName () (for projects workpace_root.getProjects))] print (Projekt_nam) But I There is an error in import. I have checked that the P4JJ is present in the Jar Eclipse plugin directory. Can anyone help please? I had to install the py4j application
Read more

python - Receiving "KeyError" after decoding json result from url -

-
I am new to Python I am trying to parse JSON result from a URL. Basically, I was using the following: response = urllib.request.urlopen (url) json_obj = json.load (response) It should be a stroke "str 'not' bytes' in the lines of a given" JSON object, so after searching on the StackoverView Flo, I decode the response in this way: F = urllib.request.urlopen (Url) charset = f.info (). Get_param ('charset', 'utf8') data = f.read () decoded = json.loads (data.decode (charset)) If I print "decode" I is as follows: { 'link': { 'summary data': 'https: // localhost / piwebapi / streams / p0_7qHaW4UHU-RlCaz8tpasAAQAAAAU0hJTExNQU42NDIwXFNJTlVTT0lE / summary' 'value': 'https: // localhost / Piwebapi / streams / P0_7qHaW4UHU-RlCaz8tpasAAQAAAAU0hJTExNQU42NDIwXFNJTlVTT0lE / price ',' InterpolatedData ':' https: // localhost / Piwebapi / streams / P0_7qHaW4UHU-RlCaz8tpasAAQAAAAU0hJTE...
Read more

.net - Creating a new Queue Manager and Queue in Websphere MQ (using C#) -

-
"itemprop =" text "> I am writing applications that use WebSphere MQ to send messages. My unittests (for flow), I want to verify that I have put the correct message on the response queue. I am trying to figure out how to do this. My main obstacle is that I think it might be scary to clear the queue before running in my queue because the same queue can be used by other applications, I thought a decent solution would be a new line The manager will remove the queue for my solidarity and after using it. So my question is: Is it possible to use C # by using queue manager and queue? After the For future reference and future people, who want to make queues. I thought how to make and remove IBM MQ QE (not quenhers) with PCM messaging. It is not very simple, but it can be done. We have implemented it in a library and it is being used to create and delete commands before and after integration tests. The most important part of the code in this library is shown in the...
Read more