Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

Add git-crypt merge driver #167

Merged
merged 1 commit into from
Sep 27, 2018
Merged

Add git-crypt merge driver #167

merged 1 commit into from
Sep 27, 2018

Conversation

davidread
Copy link
Contributor

Merging this PR will help developers that need to merge branches where gitcrypt'd files are changed on both branches.

As per: AGWA/git-crypt#140 (comment)

@davidread davidread requested a review from xoen September 25, 2018 10:41
@r4vi r4vi self-requested a review September 27, 2018 11:14
Copy link
Contributor

@r4vi r4vi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks I've always found git-crypt merge really annoying! 🛐

@davidread davidread merged commit a021b0e into master Sep 27, 2018
@damacus damacus deleted the gitcrypt-merging branch July 7, 2020 15:49
davidread pushed a commit that referenced this pull request Jul 29, 2020
davidread pushed a commit that referenced this pull request Jul 29, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants