Collaborate with colleagues who don’t use git -

-

Whenever I use git for all my projects, sometimes, I have to cooperate with colleagues. Which do not use git. They like to email their zipped sources back and forth, it is annoying and cumbersome, but I have to deal with it. The workflow is as follows:

When they require my code, then I use the git archive and give them a zip file export.zip Send. I continue to work and do the changes made by me, while they work with my old sources. Illustration:

Collection & amp; Mail │ A ← B ← C └───┴── My Later Changes

After some time they send me my response file import.zip . What is the best way to import zip file in my GIT tree and how to implement it? I can think of the following three options, which are meaningfully different:

  1. Based on their changes, consider the following changes: 

      ┌ Collection & amp; Mail │A ← A 'B ← C │ └───┴── My later changes │ └─ Their change

    Here I checkout A Import.zip open, comment as a and then re-apply B and C (and Whatever then). HEAD

  2. How to consider their changes based on my later changes: 

      A I ← ←  A < / Code> and  import.zip  and create a patch based on the difference between them. That  C .

  3. Create and merge a branch: 

      A ← B ← C ← M ↖ ↙ A '

    While writing the question, I came to the conclusion that this option is most commonly applied and is the strongest. Do you agree?

I am also grateful for other advice about that workflow. For example, I find it painful and error-prone that I You are right, # 3 is best I will create a branch for each person who can send you changes, check your branch, open the collection, and do your own Make changes in the branch. At some point you make your changes together with your changes You can merge, and git will point out the struggles for you, which is clearly not optimal, but to think relatively well that you are working around people's mailing zip. If I'm ready to send, then "tagging" as " collab-zip- & lt; Date & gt; I recommend to tag the commitment to tag a message with "some tag" or "sending changes in x because y". This tells about your last bit that the track you sent How to Keep.


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