From e796e6f401d6d7249aa6165e62354bcada3f732a Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Tue, 1 Dec 2020 16:42:50 +0000 Subject: README-hacking.md: recommended to push maneage after merging Until now at the end of the updating process, we hadn't explicity talked about pushing the branches. So people would usually only push their 'master' branch to their remote. While the merged 'master' branch does contain the commits from the core Maneage branch, having a no-updated 'maneage' branch reference on their remote can be confusing. With this commit, at the end of the process to merge with the 'maneage' branch we explicitly recommend to push both the 'master' and 'maneage' branches. --- README-hacking.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'README-hacking.md') diff --git a/README-hacking.md b/README-hacking.md index d944fb0..b57c0f6 100644 --- a/README-hacking.md +++ b/README-hacking.md @@ -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 -- cgit v1.2.1 From ff43476c4d293fda8765cfddbb1378f1b910218c Mon Sep 17 00:00:00 2001 From: Mohammad Akhlaghi Date: Sat, 2 Jan 2021 15:52:31 +0000 Subject: Copyright year updated in all source files Having entered 2021, it was necessary to update the copyright years at the top of the source files. We recommend that you do this for all your project-specific source files also. --- README-hacking.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'README-hacking.md') diff --git a/README-hacking.md b/README-hacking.md index b57c0f6..656a965 100644 --- a/README-hacking.md +++ b/README-hacking.md @@ -1,8 +1,8 @@ Maneage: managing data lineage ============================== -Copyright (C) 2018-2020 Mohammad Akhlaghi \ -Copyright (C) 2020 Raul Infante-Sainz \ +Copyright (C) 2018-2021 Mohammad Akhlaghi \ +Copyright (C) 2020-2021 Raul Infante-Sainz \ 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 - Copyright (C) 2020 YOUR NAME + Copyright (C) 2018-2021 Existing Name + Copyright (C) 2021 YOUR NAME ``` 9. **Configure Git for fist time**: If this is the first time you are -- cgit v1.2.1