How can you prevent or detect a merge that changes non-conflict files in git? -


We are using a very simple git workflow where there is the most active development on the same branch. As a result, when developers do a git pull , usually a merge commute is caused. Last week, twice a week we made a bridge to novice GIT users, which resulted in a merge collision, and then they all Removed files, on which they did not work individually and were merged. Clearly, any change that has been made as a result of the merger in the removal of a commission made by other developers.

How can you tell that a merge commute was modified in a way that matches the parent for the file without conflict? (Essentially I want to know if there is any good way to know whether "bad" merge or not.)

Is there a systematic way to keep it from happening again?

To answer your question directly, this command 

  Git diff-tree -r --diff-filter = D - only -mate $ $ $ parent

will list all the files which $ CHILD commit by If you run all the parents of a merge commute again and check that order, and they all show an annihilation, then you will know that the file was deleted in the merge, but Any merge overdue Not in father-father

He said, it seems like a big problem with your developers and your source control that this is a very specific solution. For a little better solution, give your developers the git pull --rebase or git fetch & amp; Consider using amp; GIT Rebase . I think merge works hard to follow itself, and it seems like your developers do too. If you want you can completely ban the merge.

For best solutions, good test coverage, if your developers are removed random files, then it should break the test.


-

Comments

Post a Comment

Popular posts from this blog

sqlite3 - UPDATE a table from the SELECT of another one -

I have the first table article where some data is missing. In the table, articles_tmp I have a part of the missing data. So I want to update the articles. Where the path path is data in articles_tmp.path where the path is not zero . With SQLite , it does not work: update article SET path = (SELECT at.path FROM Articles_tmp as AS, WHERE at.article_id = a.id and a.asp, the text is in the form and not on. It has been transmitted) where the path is null MS Access Along with, it works fine: Update Articles Join the Inner Articles at articles_tmp articles.id = articles_tmp.id SETP articles.path = articles_tmp.path Can anyone help? Sin CE SQL Server Syntax, which I provided, was not working, here this solution With whom I have come. A little modification of your original query, but with my "correlation" suggestion added. There is a SQL Bella for this: Here is the code: update article SET path = (SELECT path from articles_tmp AS T WHERE t.id
Read more

c# - Showing a SelectedItem's Property -

So I have enabled a rightclick option for my DataGrid. I want to display the only chosen property but it is not behaving like what I would like it to display my name and additional. Public category Paymentinfo {public int PaymentNo {get; Set; } Public string date {get; Set; } Public Double Pay {get; Set; } Public Double Principle {get; Set; } Public Double Interest {get; Set; } Public Double Balance {Received; Set; }} Private Zero MenuItem_OnClick (Object Sender, RoutedEventArgs e) {MessageBox.Show (AmortGrid.SelectedItem.ToString ()); } I'm trying to apply it without using a View Module! If I place a breakpoint where the messagebox and the recipient place it on selected ITEM, then this property will display the payment. A date-payment-principle-interest-balance is the only value that needs payment. Was hoping that it would be something like this MessageBox.Show (AmortGrid.SelectedItem.PaymentNo.ToString ()); When you call ToString () So you get the class typ
Read more

javascript - Render HTML after each iteration in loop -

I'm trying to gradually increase the font size of text on a web page. The code works in my place, although the new HTML / CSS does not render after every iteration of the loop and when all this is done, then display only the text of 100 px size. To see the text as if it is slowly zooming, I need to do this JavaScript is down because it is being used from a different file here is what I have ... < Pre> & lt; P class = "game-title" style = "font-size: 50px" & gt; Test & lt; / P & gt; Function sleep (milliseconds) {var start = new date (). GetTime (); For (var i = 0; i & lt; 1e7; i ++) {if ((new date). GetTime () - start) & gt; Milliseconds {break; CSS ('font-size', 'parseInt ($ (' game-title '). CSS (' font-size ')) + 1 + "pixels"); } While (parasont ($ ('# text'). Css ('font-size')) & lt; = 100) {sleep (1000); IncreaseSize (); Using CSS: Use of jQuery (sample):
Read more