svn - Is it better to use a separate commit message for a git merge? -

-

I came from an SVN background, so I'm not sure what the typical git workflow looks like when you merge in SVN , You provide a committed message describing the merge. This is necessary because the merge-tracking of SVN has been historically poor.

I noticed that the default behavior of git is to automatically get the result of the merge, if it succeeds. This means that the log will not normally show a merge, so in history everything looks like it was developed in a branch. Is it better to show mergence as an additional commitment? I can think of several reasons why and why not, but I need some input from other users.

Unless you select - no-merges option git log , it will generally show a merger, which is given a brief auto-generated commentary details.

This is generally okay because git records the interesting characteristics of the original and a merge, its components are the branches.

Try using a git log - graph - line or a graphical history viewer and you (should!) Be convinced that the way the git records merge , That is very important and useful, which is longer than the long-running merge comment message.

The message was something 'magical' that was done in the resolution, it is easy to add manual intervention to this point in this way.


Comments

Post a Comment

Popular posts from this blog

MySql variables and php -

-
I am getting an error with php in order to format mysql_query () in php to format this string What is the right way? SELECT SELECT SELECT (*) Agents @AgentCount; User_Agent_English, User_Angent_Oursal, US.___Gent_Aginal, COUNT (User_Agent_Percade) ACC, COUNT (*) / (AgentCount) Percentage by agents user_agent_preser order DEC limit limit 50; In PHP, how am i setting $ query $ query = "SELECT count (*) agents @ agentcount; SELECT user_agent_parsed, User_agent_original , COUNT (user_agent_parsed) ascount, COUNT (*) / (@AgentCount) as a percentage by user_agent_parced by URI date DESC limit 50 "; This exact query will work properly if I put it in MySQL directly through a command line session. Do I need to release two separate php calls from mysql_query () and store the results first? I get the following error: There is an error in your SQL syntax; Instead of using a sub-selection and instead of using the 'SELECT user_agent_parsed, user_agent_original, ne
Read more

c# - How can I find out if there are windows above a control? -

-
If I have Winforms controls, can it be possible to tell whether the window above it (from any application)? Actually, I have to know that some parts of my control are actually appearing on the screen. If you are happy to p / call, the EnumWindows function provides all top-level windows HWND on the screen is; This allows you to get a Non-Client Rectangle (GetWindowRect) to compare the limits of your form. This non-rectangular opaque areas (media player and fancy skins for choice), so you can be false positive for such a control window.
Read more

javascript - Classic ASP "ExecuteGlobal" statement acting differently on two servers -

-
I have a strange problem that I really do not know. In addition to developing a new ASP.NET site, I have to support the old "classic ASP" site. It is written in VBScript with a batch of JavaScript functions. Many of the JavaScript functions include 'files' Everything is fine on our production system (which security is controlled by another group - this is a military installation) Debugging them once did not work I). However, I have a fix for a vague bug that needs to be fully tested and some functions do not run under the "local" copy of the website that runs on my PC. For the record, I am running IIS 5.1 on XP. The problem is that some Javascript functions are running "OK" on the production server, but when they use it as a server, they are not defined on my PC what is happening that last Programmer, for some reason, has decided to put some functions in a series of files, which according to the observations, imitate the "need_once
Read more