[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[be] [task #8730] Merge - Synchronize/collaboration: Same merging?
|
From: |
Teus Benschop |
|
Subject: |
[be] [task #8730] Merge - Synchronize/collaboration: Same merging? |
|
Date: |
Sat, 04 Oct 2008 08:43:27 +0000 |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.14) Gecko/20080404 Firefox/2.0.0.14 |
Follow-up Comment #1, task #8730 (project bibledit):
Git does a blind merge. It tries to keep the changes in the local data, and
tries to keep the changes in the remote repository, merges these into one data
set, and then stores that set local and remote.
_______________________________________________________
Reply to this item at:
<http://savannah.nongnu.org/task/?8730>
_______________________________________________
Message sent via/by Savannah
http://savannah.nongnu.org/