[be] [task #8730] Merge - Synchronize/collaboration: Same merging?

[Wolfgang Stradner]

Follow-up Comment #2, task #8730 (project bibledit):

In hmerging.html#mergechapterofeditedprojectandmasterproject it is written:

'There is the master project, and the edited project. If the user merges
these both, then the tool is going to look back in the history of all changes
ever made in that chapter, till it finds the point that this particular
chapter is the same in both master and edited project. It then looks at the
changes made in the master project, and tries to keep these. It also looks at
the changes made in the edited project, and tries to keep these too. It then
puts both of these changes in a new chapter, and finally saves that chapter in
both master and edited project, so that we can truly say that a merge has
occurred. The goal is that this chapter is going to be merged, and will after
merge be the same in both projects.'

If this kind of (simple) merge described here does the same job as
synchronization in the collaboration process:

-> Use also the term 'merge' in the collaboration process.
This would be easier for the user to know, what you speak about.

If those two action do not do the same thing:

-> add to (in one or two sentences)
olh_git_setup.html#initializingthelinktotherepository
what the difference is between the 2 is.

    _______________________________________________________

Reply to this item at:

  <http://savannah.nongnu.org/task/?8730>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.nongnu.org/