New URL for NEMO forge! http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.

WorkingGroups/TAM/MergingGit (diff) – NEMO

Context Navigation

Changes between Version 1 and Version 2 of WorkingGroups/TAM/MergingGit

Timestamp:: 2009-12-04T15:11:30+01:00 (14 years ago)
Author:: avidard
Comment:: --

Legend:

: Unmodified
: Added
: Removed
: Modified

WorkingGroups/TAM/MergingGit

-                      v1
+                      v2
 import the repository to be merged in as a branch
+import the repository to be merged in as a branch (called tomerge here)
 {{{
 git fetch $reptomerge HEAD:tomerge
 …
 git merge (--no-commit) tomerge
 }}}
+if there are some conflicting files.F90
+{{{
+git mergetool files.F90
+}}}