git-chat

git-chat copied to clipboard

A couple options come to mind:

1. Try using git commit --allow-empty, with no actual content changes to avoid spurious merge conflicts.
   • You may need to configure the repo to prevent rebasing though as by default git rebase kvetches about empty commits.
   • You could also do a git fetch then a git rebase --keep-empty to get around the problems there of course, but that seems.
2. Use git fetch followed by git merge --strategy=ours.

I don't really intend to maintain this repo, but that stuff is helpful, thanks.