Skip to content
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.

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

[WIP] diff tools #651

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

asmallteapot
Copy link
Contributor

intent of this PR is to add support for using the xcodeproj command as a git difftool.

@CocoaPodsBarista
Copy link

1 Warning
⚠️ Please include a CHANGELOG entry to credit yourself!
You can find it at CHANGELOG.md.

Here's an example of your CHANGELOG entry:

* [WIP] diff tools  
  [asmallteapot](https://github.com/asmallteapot)
  [#issue_number](https://github.com/CocoaPods/CocoaPods/issues/issue_number)

note: There are two invisible spaces after the entry's text.

Generated by 🚫 Danger

@asmallteapot
Copy link
Contributor Author

The first build failed because master is currently stuck on 1.5.9. Should I create a PR to bump master, or is it being held back intentionally?

@segiddins
Copy link
Member

Looks like travis is failing to install bundler?

@dnkoutso
Copy link
Contributor

rebase might fix it. if not I can assist.

@dnkoutso
Copy link
Contributor

@asmallteapot is this change considered complete?

@asmallteapot
Copy link
Contributor Author

remaining tasks for this PR

  • Fix xcodeproj --help not showing the diff subcommand
  • Add CHANGELOG.md entry

@segiddins
Copy link
Member

I'm nervous that no tests broke due to this change. Additionally, does this change the command names used to access the commands? If so, that's a backwards-incompatible change

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants