KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
Been trying out Git and Github after many years of svn use. I seem to have the basics down, but one item is confusing me. UserA makes a change to FileA and pushes to the remote server (GitHub) UserB makes a change to FileB. He first pulls from remote server, and then pushes his change to FileB to the remote server GitHub commit history shows the push from UserA and the push from UserB However, there is an additional entry in the commit history from UserB called 'Merge branch 'master' of https://github.com/xxx/yyy '. Viewing the diff in Github shows this to be an exact replica of the Changes that UserA made to FileA Why is this duplicate shown - both the push from UserA to FileA and the Merge branch master entries are identical...the second seems superfluous to me.
Tags (comma-separated)
Save Edits
Cancel