Skip to content
New issue

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

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

Already on GitHub? # to your account

Update project description #39

Merged
merged 1 commit into from
Jun 7, 2017
Merged

Conversation

BurtHarris
Copy link
Contributor

Fixes #37

Note: Running npm@5, it generated a package-lock.json file. I don't know much about that yet, but the message from npm suggested checking it in.

@phated
Copy link
Member

phated commented Jun 6, 2017

I don't agree with the lock file. Please remove.

@BurtHarris
Copy link
Contributor Author

BurtHarris commented Jun 6, 2017

@phated Would you like me to use git rebase -i master to clean up the commit history? Would that have been a better way?

I'm an experienced dev with very little git experience... just learning my way around.

@phated
Copy link
Member

phated commented Jun 6, 2017

It's not necessary to rebase since github added the "squash and merge" button, but if you want to practice, I don't mind.

@BurtHarris
Copy link
Contributor Author

@phated Thanks for the learning experience. The rebase is easy, but leaves me unable to push. Can you advise? If its complex, please use the squash & merge thing. Thanks

My status:

PS C:\code\async-done> git status
On branch description
Your branch and 'origin/description' have diverged,
and have 1 and 4 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
nothing to commit, working tree clean

Then when I try to push it back to my GitHub fork, I get:

PS C:\code\async-done> git push
To https://github.com/BurtHarris/async-done.git
 ! [rejected]        description -> description (non-fast-forward)
error: failed to push some refs to 'https://github.com/BurtHarris/async-done.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

@phated
Copy link
Member

phated commented Jun 6, 2017

git push -f (force push, be careful)

@BurtHarris
Copy link
Contributor Author

That worked, thanks.

@phated
Copy link
Member

phated commented Jun 7, 2017

@BurtHarris this is a really great description. Thanks!

@phated phated merged commit cca775b into gulpjs:master Jun 7, 2017
@BurtHarris BurtHarris deleted the description branch June 7, 2017 20:13
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants