New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix merge of struct with unexported fields. Issue #38 #39

Merged

darccio merged 3 commits into darccio:experimental from TheoBrigitte:master

Oct 9, 2017

Contributor

TheoBrigitte commented Feb 22, 2017

Attempt to fix issue #38 by checking for unexported fields upfront

TheoBrigitte added 3 commits

February 22, 2017 21:04


          Fix merge of struct with unexported fields. Issue darccio#38


          Merge struct with at least one exported field

b488823


          Add tests for issue darccio#38

34a0a88

darccio changed the base branch from master to experimental

October 9, 2017 17:35

darccio merged commit eebface into darccio:experimental

Owner

darccio commented Oct 9, 2017

Merged on master after fixing tests. Your first test assumed Merge works like MergeWithOverride.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet