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

Improvments for more specifc projects and documentation. #15

Closed
wants to merge 8 commits into from

Conversation

psander-com
Copy link

No description provided.

@StreakyCobra
Copy link
Owner

Hi,

Thanks for the contribution.

This is quite a huge change, I'll need time to go through it. Sadly there is some incompatible changes in regards to the current develop branch. After a quick overview, here are my first impressions:

  • The update of comments can be integrated.
  • Command line options can probably be integrated.
  • The -r option, specific to you new pull command, has been implemented in a general way with a second argument.
  • Adding support for branches will require some thinking (and changes): In the develop branch the support for multiple remotes was added, and the syntax you propose is incompatible (see this comment).

I have also two questions:

  • What is the purpose of the proposed pull command vs the existing ff (pull fast-forward)?
  • Isn't this function the same as this one?

@emlun
Copy link
Collaborator

emlun commented May 20, 2017

Hi,

You've probably moved on by now, but I'd still like to get this closed.

Again, thanks for the contribution, but I'm afraid we can't merge this - the main reason being that the changed format for .projects.gws is incompatible with all existing gws project files.

Like @StreakyCobra said the command line options could probably be integrated, but I honestly don't really see a use case for them. If you'd still like them merged, please open a new issue about it and we'll discuss it there.

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

Successfully merging this pull request may close these issues.

3 participants