LivelyKernel / LivelyKernel/lively4-core

META better github history

Open
#282 0 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

comp: server comp: sync tool effort2: medium (days) P4: nice to have type: feature type: RFC / discussion / question
Dominant language
JavaScript
Stars
89
Forks
25
PR merge metrics
No merged PRs in 30d

Description

The current tools and github abstractions we use, do a normal merge that is displayed in a weirdly verbose way in github. We could avoid this in changing our sync script to not directly merge the master back, but to first checkout the master and merge our changes back into the master and commit than. This should flip the sides and show only changes of the author in the new merge commit.

The implementation is should go here: lively4-server/bin/lively4sync.sh
This is the line that has to be worked on:

```bash
echo "PULL"
git pull --no-edit origin "$BRANCH" ;
```

Contributor guide

No contributing guide indexed for this repository

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

Research direction

Start in lively4-server/bin/lively4sync.sh at the `echo "PULL"` and `git pull --no-edit origin "$BRANCH"` lines, and inspect how the sync script performs its merge. Run the sync workflow and verify that the resulting GitHub merge history displays only the author's changes rather than a verbose reverse merge.

Written by the indexing model from the issue text.

Assessment

Tech stack
git, shell
Domain
tooling
Issue type
Refactor
Difficulty
2/5
Estimated time
1-3 hours
Activity status
Stale
Clarity
Mostly clear
Newbie friendliness
48/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.