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

HTML/CSS - Automatically set height width from background image? -

-
Long time ... I do not think it's possible, but I'm shocked before! I tag anchor tags, all of which are background images, all 300px wide but their height is all the difference, is it really set to do without typing altitude? Is it to set the dimensions of BG URL? Thank you! I do not think people understand - my mistake is to hurry the question. Here is the code as an example: # ago -1 {width: 300px; Height: 410px; Background: url ('/ image-1.jpg');} # East -2 {width: 300px; Height: 420px; Background: url ('/ image-2.jpg');} # Pre-3 {width: 300px; Height: 430px; Background: url ('/ image-3.jpg');} # Pre-4 {width: 300px; Height: 440px; Background: url ('/ image-3.jpg');} & lt; A href = "#" id = "ex-1" & gt; & Lt; / A & gt; & Lt; A href = "#" id = "ex-2" & gt; & Lt; / A & gt; & Lt; A href = "#" id = "pre-3" & gt; & Lt; / A & gt...
Read more

php - Mysql Show Process - Sleep Commands and what to do -

-
I am thinking that there is something that I can do better so that my process list should start with the command with MySQL Be clear Currently I am looking for a lot: 17325 user_a localhost db_1 sleep 1132 NULL 17464 user_a localhost db_1 sleep 1124 NULL 17983 user_a localhost db_1 sleep 1078 null 18113 user_a localhost db_1 sleep 1068 NULL 18207 user_a localhost db_1 sleep 1060 NULL 18231 user_a localhost db_1 sleep 1058 NULL 18353 user_a localhost db_1 sleep 1047 NULL 18447 user_a localhost db_1 sleep 1040 null 18489 user_a localhost db_1 sleep 1036 NULL 23408 user_a localhost db_1 sleep 637 NULL Something in my phpscript is that I want to clean it Can i The script looks like: Select the ID from $ q = 'db_1 where fkId = 2'; $ Ar = mysql_query ($ q); ($ Line = mysql_fetch_array ($ qr)) {echo ($ row ['id'];} Thanks in advance! I'm guessing that when you have 10 threads, you're constantly using the connectio...
Read more

c - What is the address of buf (the local variable in the main function)? -

-
I had exercise with programming in c or classes and I followed the question: Is Buf (local variable in main function)? Either enter the answer in hexadecimal format (like 0x 8 "digits" 0-9 or A-F, 0xbfff0014) or in decimal format. Note here that we want the address of the buff, not its content. The code looks like this: int main (int argc, char * argv []) {while (1) {four buff [1024] = {0}; Int r; .... I then started the code and put the built code in the buff [1024] line and in Typed Gdb p & amp; Buf and it gives me results: 0xbffff0f0 But when I use it in this quiz it gives me the result that this value is wrong. My question is this: Is this the name of the Buff variable (P & E)? Or if not, why not? Exercise is done on the virtualbox machine, so I think everyone should be the same address There is no correct numerical answer, the address may vary from one time to another, it is a programming drill that you say the following three...
Read more