git - take everything from a branch regardless of conflicts and other changes -

-

I'm merge a GIT and I'm merged with this branch and it's merged.

Consider the code of the branch with the code of B. Today with the code today

I want to merge branch B into the branch. If there is a conflict, then I want to take it from Branch B. If any file changes (auto-merge), then I want to ignore them and want to take them again from the branch

There is no way that I can force all the files which have been converted into branches, the contents of the files on the branches

GIT has merged and did not file, so I'm not sure that this is possible. Otherwise I would compare and compare and replace each file. (There are 1000 eekk!)

thanks

edit Thanks for the comment @AndrewC I want to be the opposite of us. From the documentation

Our - It solves in any number, but the result of the merge is always the current branch head. It is used to eliminate the old development history of side branches.

I am at branch A and want to merge with the branch and want to put all the branches in B files. I think that all branches will have to keep a file using our merge strategy

conflict with merge If the branch A files were lasted / cloned / faked, then you have not changed, until you have changed, are you sure that you want to overwrite the branch with B files? Are you

If you want to overwrite, do a git position for merging and conflict, you want everything from Branch B, right? Why not write a little bit to check everything in the GIT status from GT position?

Basically read all file paths from GIT status and: 

  git checkout & lt; Branch_b_name & gt; / Path / to / file

Comments

Post a Comment

Popular posts from this blog

apache - 504 Gateway Time-out The server didn't respond in time. How to fix it? -

-
Using a form submission on an embedded iframe , the customer downloads a compressed log file Requested. The request was sent to the server, which is the compressed log files, perform some database operations and returns a compressed file. After just 2 minutes, 504 gateway time-out server did not respond timely message on browser net panel How to fix this error? The log files were taking a long time to compress, and timeout was set to 2min The error was fixed by extending the file file: # # timeout: The number of seconds before getting the time out. # # # Timeout 120 timeout 600
Read more

c# - .net WebSocket: CloseOutputAsync vs CloseAsync -

-
We have a working ASP.NET Web API REST service, which is one of the methods of our controller, HTTPTTEX. .) Socket handler code looks something like this ... Public async task socket handler (AspNetWebSocketContext context) {_webSocket = context.WebSocket; ... while (! Cts.IsCancellationRequested) {WebSocketReceiveResult Results = _webSocket.ReceiveAsync (Input Segment, cts.Token) .Result; WebSocketsStateCollusocketState = _webSocket.State; If (result.MessageType == WebSocketMessageType.Close || currentSocketState == WebSocketState.CloseReceived) {// What should I use. CloseAysnc () or. CloseOutputAsync ()? _webSocket.CloseOutputAsync (WebSocketCloseStatus.NormalClosure, "Client Requested", cts.Token). Wait (); } If (currentSocketState == WebSocketState.Open) {...}}} .What is the difference between .CooseAsync () and CloseOutputAysnc ()? I tried both of them and they both seemed to work fine but some difference should be the same they both describe very similar to...
Read more

c++ - How to properly scale qgroupbox title with stylesheet for high resolution display? -

-
I am trying to apply a stylesheet for QGroupBox (QT4.8), which works on the normal screen ( 96 dpi) high resolution screen (Yoga 2 Pro, 3200x1800, 275 dpi, windows 8.1). The following style looks good on the 275 dpi screen, but the top margins on a regular 96 dpi screen are far too big. QGroupBox {border: 1px solid red; Range radius: 7px; Margin-top: 12x; } QGroupBox :: Title {subcontrol-origin: margin; Subcontrol-position: left above; Padding-left: 10px; Padding-right: 10px; } Changing the top-margin has an effect, but I did not get a proper setting which works on both screens. If I shorten the value, the content of the group box overlaps with the title on 275 dpi screen. I was also playing with units "East", "PX", "MX", "PT". Reading the document I would have guessed, "2 X" was the correct solution, which should be scaled with different screen resolutions. Without the stylesheet, the groupbox works well on both screens. ...
Read more