diff options
author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-03 15:24:08 +0000 |
---|---|---|
committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-03 15:24:08 +0000 |
commit | daeb41ba00427d28e22169381bc21b1ad784d087 (patch) | |
tree | 8a3267559a0f5c8dc63fae16ae2bc65d8ab6715e /README-hacking.md | |
parent | 281ad23c2218560bcdfe3e76cf61f4901f76b257 (diff) | |
parent | b1bd282bc3bcd11573fc064edfbab1bd65564348 (diff) |
Imported recent updates in Maneage, minor conflicts fixed
There were only three very small conflicts that have been fixed.
Diffstat (limited to 'README-hacking.md')
-rw-r--r-- | README-hacking.md | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/README-hacking.md b/README-hacking.md index d944fb0..656a965 100644 --- a/README-hacking.md +++ b/README-hacking.md @@ -1,8 +1,8 @@ Maneage: managing data lineage ============================== -Copyright (C) 2018-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>\ -Copyright (C) 2020 Raul Infante-Sainz <infantesainz@gmail.com>\ +Copyright (C) 2018-2021 Mohammad Akhlaghi <mohammad@akhlaghi.org>\ +Copyright (C) 2020-2021 Raul Infante-Sainz <infantesainz@gmail.com>\ See the end of the file for license conditions. Maneage is a **fully working template** for doing reproducible research (or @@ -747,8 +747,8 @@ First custom commit and generally, all the files you modified in the previous step. ``` - Copyright (C) 2018-2020 Existing Name <existing@email.address> - Copyright (C) 2020 YOUR NAME <YOUR@EMAIL.ADDRESS> + Copyright (C) 2018-2021 Existing Name <existing@email.address> + Copyright (C) 2021 YOUR NAME <YOUR@EMAIL.ADDRESS> ``` 9. **Configure Git for fist time**: If this is the first time you are @@ -1522,13 +1522,20 @@ for the benefit of others. # conflicts" (not detected as a conflict by Git, but may cause a # crash in your project). You can backup your build directory # before running the 'distclean' target. - - # Any error in the build will be due to changes in Maneage, so look - # closely at the commits (especially the - + # + # Any error in the build will be due to low-level changes in + # Maneage, so look closely at the commit messages in the Maneage + # branch and especially those where the title starts with + # 'IMPORTANT'. ./project make distclean # will DELETE ALL your build-directory!! ./project configure -e ./project make + + # When everything is OK, before continuing with your project's + # work, don't forget to push both your 'master' branch and your + # updated 'maneage' branch to your remote server. + git push + git push origin maneage ``` - *Adding Maneage to a fork of your project*: As you and your colleagues |