Add merge conflicted files to user info by pietbrauer · Pull Request #550 · libgit2/objective-git
Navigation Menu
{{ message }}
libgit2 / objective-git Public
- Notifications You must be signed in to change notification settings
- Fork 285
Merged
Merged
Conversation
joshaber
self-assigned this
Copy link
Member
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should expose this from the header too, so users don't have to know the string literal.
Copy link
Member
joshaber
commented
Feb 3, 2016
joshaber commented
Feb 3, 2016Good idea 👍
Copy link
Member Author
pietbrauer
commented
Feb 3, 2016
pietbrauer commented
Feb 3, 2016Done 👍
ObjectiveGit/GTRepository+Pull.h
Outdated
ObjectiveGit/GTRepository+Pull.h Outdated
Copy link
Member
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Documentation please 😬
Copy link
Member
joshaber
commented
Feb 3, 2016
joshaber commented
Feb 3, 2016Just 1️⃣ 📝
Copy link
Member Author
pietbrauer
commented
Feb 3, 2016
pietbrauer commented
Feb 3, 2016Done ✅
Copy link
Member
joshaber
commented
Feb 3, 2016
joshaber commented
Feb 3, 2016🚢
joshaber added a commit that referenced this pull request
Feb 3, 2016…ror-info Add merge conflicted files to user info
joshaber
merged commit
d2e3eb7
into
master
joshaber
deleted the
add-merge-conflicted-files-to-error-info
branch
Copy link
Member Author
pietbrauer
commented
Feb 3, 2016
pietbrauer commented
Feb 3, 2016
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants