Skip to content

Replace forum references in the CLI with Stack Overflow #3872

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

Closed
wants to merge 32 commits into from

Conversation

rdlauer
Copy link
Contributor

@rdlauer rdlauer commented Sep 6, 2018

As we are looking to deprecate usage of the community forum by the end of September, this PR replaces most references of the forum with appropriate Stack Overflow links.

rosen-vladimirov and others added 30 commits July 25, 2018 08:42
…p-verstion-4.3.0

chore: Bump version to 4.3.0
…ge-rel-master

chore: merge release in master
…ge-rel-master

chore: merge release in master
- `tns plugin create` command
- add documentation
- add tests
# Conflicts:
#	lib/common
#	npm-shrinkwrap.json
#	package.json
- $npm.install replaces $childProcess.exec("npm i")
- extract prompts to separate functions
- $childProcess.spawnFromEvent replaces $childProcess.exec
- formatting
- update tests
…ugin-command

feat: add create plugin command
Accepting .tar.gz path/URL for custom plugin seed.
+ test
+ help
…eate-with-template

feat: add template option to plugin create command
…ge-rel-master

chore: merge release in master
…ndroid-long-living-socket

feat: use long living socket connection for sync
…ing-promises

Add no-floating-promises options to tslint in order to ensure all promises are properly handled
…-justlaunch

fix: command with justlaunch option doesn't exit
@rosen-vladimirov
Copy link
Contributor

Hey @rdlauer ,
Can you please retarget this PR to release branch, so we can include it in the incoming 4.2.4 version of CLI?

@rdlauer rdlauer changed the base branch from master to release September 10, 2018 13:55
@rdlauer
Copy link
Contributor Author

rdlauer commented Sep 10, 2018

@rosen-vladimirov my git skills are lacking...but I think I just did what you asked...?

@rosen-vladimirov
Copy link
Contributor

Hey @rdlauer ,
I think you have changed the base branch of the PR, which is almost what I've requested. The problem with this approach is that your branch already contains a lot of commits from master branch. So when you've retargeted it to release branch, you branch introduces a lot of new commits instead of only one (the one we would like to have in the release branch).
This is normal and in such cases you have to apply some changes manually. For example, my own workflow in such cases (I wouldn't say it is perfect, but I'm used with it) is the following:

$ git checkout <my branch>
$ git log -1 # this gives me the sha of my last commit, the one I want to move in the release branch
$ git fetch origin # update the local copies of the remote branches
$ git reset --hard origin/release # resets your local branch to the state of the branch you want to use as a base
$ git cherry-pick <sha taken from git log> # gets the commit you want and places it at the top of the current tree
$ git push -f origin <my branch>

I've already applied a similar approach for your changes and I've created another PR: #3881, so I'm closing this one. Thanks for your help!

@rdlauer
Copy link
Contributor Author

rdlauer commented Sep 11, 2018

Thanks @rosen-vladimirov!

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.

6 participants