diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-12-01 16:42:50 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2020-12-01 16:47:31 +0000 |
| commit | e796e6f401d6d7249aa6165e62354bcada3f732a (patch) | |
| tree | a8db243f6622e513ec5dcc0d08f7b90f1fd938aa | |
| parent | ac8eee90b1580fb566ee5b84fef9acb4ed437c01 (diff) | |
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.
| -rw-r--r-- | README-hacking.md | 15 |
1 files changed, 11 insertions, 4 deletions
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 |