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

[Wolfgang Stradner]

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

                 Summary: Merge - Synchronize/collaboration: Same merging?
                 Project: Bibledit
            Submitted by: ewst
            Submitted on: Sat 04 Oct 2008 08:39:31 AM GMT
         Should Start On: Sat 04 Oct 2008 12:00:00 AM GMT
   Should be Finished on: Sat 04 Oct 2008 12:00:00 AM GMT
                Priority: 5 - Normal
                  Status: None
                 Privacy: Public
             Assigned to: None
             Open/Closed: Open
         Discussion Lock: Any

    _______________________________________________________

Details:

What is the difference between those two terms used in BE?

There is an option in the Git Remote Repository Setup dialog box: 
'Synchronize local data with repostiroy now which is described in:

olh_git_setup.html#initializingthelinktotherepository:
'Or you can synchronize the local data with the remote repository. This pulls
all changes from the repository and MERGES that with the local data, and then
it pushes all changes of the local data into the repository.'

->? Is this the same kind of merging as in the select option dialog, which is
described in:
merging.html#mergechapterofeditedprojectandmasterproject




    _______________________________________________________

Reply to this item at:

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

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