search

l-arnold / tkl-nomadic-odoo

Focused on Flow and Function
Other
4 stars 44 forks source link

Balancing Merge. May not be required. #32

Closed l-arnold closed 9 years ago

l-arnold commented 9 years ago

Dev wip1 - samba removal - some documentation updates

JedMeister commented 9 years ago

Looks like this didn't actually change anything... "Showing  0 changed files with 0 additions and 0 deletions."

l-arnold commented 9 years ago

I know. I was reasponding to the "xyz" branch is 1 commit in front of the "other" branch. I thought they should be the same. Evidently the Pull Request is a commit thus the inbalance.

JedMeister commented 9 years ago

Ok so let's imagine the 2 branches are 'master' and 'dev'. You work away in 'dev' committing as you go. When everything is awesome you merge 'dev' into 'master'.

When you merge 'dev' into 'master' it pulls in the complete 'dev' git history (each of the commits you did in 'dev' is still listed separately in 'master') but the merge creates a new commit object (which is essentially empty but contains the note of the branch/fork which was merged). This will make 'master' one commit ahead of dev, although the code will actually be the same! :smile:

l-arnold commented 9 years ago

:+1: