From the article: '"With Subversion, you can have a 1T repository and check out just a small portion of it, The developers don't need full copies," Stein explained.
"Git shops typically have many, smaller repositories, while svn shops typically have a single repository, which eases administration, backup, etc."'" Major new features of 1.8 include switching to a new metadata storage engine by default instead of using Berkeley DB, first-class renames (instead of the CVS-era holdover of deleting and recreating with a new name) which will make merges involving renamed files saner, and a slightly simplified branch merging interface.
If you dig into the histories of both branches you should be able to find a set of conflicting changes that clearly indicate a conflict.
This is really the first thing you need to figure out in a tree conflict scenario: What did people do to make this happen?
Well, if what you've committed now is your desired merge result, then that's fine.
This won't haunt you forever if you start using the proper merge commands in the future.
The most important thing is that you could always commit the desired merge result.
For a couple weeks, maybe, you merge from trunk into your branch. You do this by taking the changes from your branch and merging them into trunk. All your tree is marked as changed, or files disappear, or changes are scrambled. ” — I’ve heard that from so many developers so many times! Now, I am not going to go through the details as to why it doesn’t work, but there is a simple reason it doesn’t work: time. The first time you pull from trunk to your branch, you copy a set of changes.But this rebase requires the commits on the source branch to be [An aside: merging in Git can sometimes result in a special case: the ‘fast forward merge’.This only applies if there are no commits in the destination branch which aren’t already in the source branch.If merging a branch back into trunk (or into whichever other branch it was branched off from) use the "reintegrate" type of merge.
If you stick to that there should be no spurious conflicts.
It sounds like you mainly want the sync and reintegrate merges as explained in remember which direction you're merging in.