[Git-commits] [grml/grml-etc-core] 77f141: Merge grml-scripts-core

[Chris Hofstaedtler]

  Branch: refs/heads/merge-scripts-core
  Home:   https://github.com/grml/grml-etc-core
  Commit: 77f141ab5a4dcbdca167869c67f2323d856bc308
      https://github.com/grml/grml-etc-core/commit/77f141ab5a4dcbdca167869c67f2323d856bc308
  Author: Chris Hofstaedtler <ch at grml.org>
  Date:   2025-06-22 (Sun, 22 Jun 2025)

  Changed paths:
    A debian/.gitignore
    M debian/control
    A debian/grml-etc-core.links
    A debian/grml-etc-core.manpages
    M debian/install
    M debian/rules
    A manpages/grml-scripts-core.1
    A usr_bin/cpu-screen
    A usr_bin/ip-screen

  Log Message:
  -----------
  Merge grml-scripts-core

As a precursor to grml/grml-etc-core#188 and in the spirit of
grml/grml#225 (reduce meta-work) lets merge the package containing
the two scripts used by the screen configuration shipped in this package.

Steps:

```
grml-etc-core$ git checkout -b merge-scripts-core
grml-etc-core$ git remote add grml-scripts-core ../grml-scripts-core
grml-etc-core$ git fetch grml-scripts-core
remote: Enumerating objects: 2355, done.
remote: Counting objects: 100% (2355/2355), done.
remote: Compressing objects: 100% (730/730), done.
remote: Total 2355 (delta 1602), reused 2344 (delta 1594), pack-reused 0 (from 0)
Receiving objects: 100% (2355/2355), 591.24 KiB | 36.95 MiB/s, done.
Resolving deltas: 100% (1602/1602), done.
>From ../grml-scripts-core
 * [new branch]      master     -> grml-scripts-core/master
...
grml-etc-core$ git merge grml-scripts-core --allow-unrelated-histories
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging debian/changelog
CONFLICT (add/add): Merge conflict in debian/changelog
Auto-merging debian/control
CONFLICT (add/add): Merge conflict in debian/control
Auto-merging debian/copyright
CONFLICT (add/add): Merge conflict in debian/copyright
Auto-merging debian/rules
CONFLICT (add/add): Merge conflict in debian/rules
Recorded preimage for '.gitignore'
Recorded preimage for 'debian/changelog'
Recorded preimage for 'debian/control'
Recorded preimage for 'debian/copyright'
Recorded preimage for 'debian/rules'
Automatic merge failed; fix conflicts and then commit the result.
```

```
grml-etc-core$ git status
On branch merge-scripts-core
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
	new file:   debian/.gitignore
	new file:   debian/grml-scripts-core.install
	new file:   debian/grml-scripts-core.links
	new file:   debian/grml-scripts-core.lintian-overrides
	new file:   debian/grml-scripts-core.manpages
	new file:   manpages/grml-scripts-core.1
	new file:   usr_bin/cpu-screen
	new file:   usr_bin/ip-screen

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both added:      .gitignore
	both added:      debian/changelog
	both added:      debian/control
	both added:      debian/copyright
	both added:      debian/rules
```

Manually merge the conflicted files, and merge grml-scripts-core.* into grml-etc-core files.

```
grml-etc-core$ git checkout --ours debian/changelog
Updated 1 path from the index
grml-etc-core$ git rm -f debian/grml-scripts-core.lintian-overrides
rm 'debian/grml-scripts-core.lintian-overrides'
grml-etc-core$ git rm -f debian/grml-scripts-core.install
rm 'debian/grml-scripts-core.install'
grml-etc-core$ git mv debian/grml-scripts-core.links debian/grml-etc-core.links
grml-etc-core$ git mv debian/grml-scripts-core.manpages debian/grml-etc-core.manpages
```

Mark conflicts as resolved:

```
grml-etc-core$ git add .gitignore debian/changelog debian/control debian/copyright debian/rules debian/install
```



To unsubscribe from these emails, change your notification settings at https://github.com/grml/grml-etc-core/settings/notifications