zopencommunity / zopencommunity/gitport
git rerere does not apply zos-working-tree-encoding after auto-resolving conflicts
Open
@HarithaIBM is already working on this.
Since Jul 20, 2026.
- Dominant language
- Shell
- Stars
- 10
- Forks
- 7
- PR merge metrics
- No merged PRs in 30d
Description
I have rerere enabled in my .gitconfig:
[rerere]
enabled = true
After doing a git cherry-pick, conflicts are found (which is expected in my case), after which git rerere tries to auto resolve the conflicts (also a good thing because i've resolved these conflicts before). However, the resulting files are not encoded properly on zos. It appears that the zos-working-tree-encoding attribute has not been respected.
Contributor guide
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Assessment
This issue has not been assessed yet.