diff options
| author | Olav Vitters <olav@vitters.nl> | 2020-07-26 16:08:10 +0200 |
|---|---|---|
| committer | Olav Vitters <olav@vitters.nl> | 2020-07-26 16:08:10 +0200 |
| commit | fdf1c7b6602fe404d01179784145e71175f13229 (patch) | |
| tree | 93fe58dbe0244f3b3420224f270829d51c0921fb | |
| parent | 01b77dada73b9c508be8f6003e35d3f91b941b00 (diff) | |
| download | initscripts-fdf1c7b6602fe404d01179784145e71175f13229.tar initscripts-fdf1c7b6602fe404d01179784145e71175f13229.tar.gz initscripts-fdf1c7b6602fe404d01179784145e71175f13229.tar.bz2 initscripts-fdf1c7b6602fe404d01179784145e71175f13229.tar.xz initscripts-fdf1c7b6602fe404d01179784145e71175f13229.zip | |
merge instructions: explain that it is good to first minimize the changes with upstream
| -rw-r--r-- | README.Mageia.md | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/README.Mageia.md b/README.Mageia.md index 126c5c97..02236d09 100644 --- a/README.Mageia.md +++ b/README.Mageia.md @@ -58,8 +58,15 @@ You can then push this to us quite happily: #### Merging +Before doing a merge, it's good to minimize the changes with upstream. For example, if the fork is based upon 9.78, first check for the changes. Use: + + $ git diff 9.78...mga/distro/mga ':!man/' ':!mandriva/ChangeLog' ':!*.po' ':!mandriva/po' + +In above command git is instructed to hide certain directories. Make sure to run the command from the main directory for this to work. + We try to stick to merging only upstream tags. To do this we would simply do: + $ git checkout distro/mga $ git merge 9.78 You then have the fun job of fixing the (no doubt) numerous conflicts! |