These are chat archives for alariva/timegridDevelopment

22nd
Nov 2016
Kashyap Sharma
@Kashyap12
Nov 22 2016 03:28
hi @alariva
facing issue
while pushing to git

git push origin issue/134-remove-unused-variable

To https://github.com/Kashyap12/timegrid.git
! [rejected] issue/134-remove-unused-variable -> issue/134-remove-unused-variable (non-fast-forward)
error: failed to push some refs to 'https://github.com/Kashyap12/timegrid.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

not sure if i am missing something
Ariel Vallese
@alariva
Nov 22 2016 03:34
In this case
And only in this case
Add --force
Since you want to overwrite your fork version
Read about forcing git pushes to see when its handy to use
Kashyap Sharma
@Kashyap12
Nov 22 2016 03:40
ok
Kashyap Sharma
@Kashyap12
Nov 22 2016 03:58
ran the tests locally
in the container
after making the changes
all the tests went fine
now submitting a PR
Ariel Vallese
@alariva
Nov 22 2016 04:11
Ok
Good
Looks good
However, you must avoid editing unrelated files like the web router
You need to rebase your commit and remove that commit
Or redo your change into a new branch discarding this one
Your PR should be a single commit change
Kashyap Sharma
@Kashyap12
Nov 22 2016 04:36
ok
Ariel Vallese
@alariva
Nov 22 2016 05:07
Ok, im going bed
The change is ok, you just need to conquer rebase or redoing the PR into a single commit
Ariel Vallese
@alariva
Nov 22 2016 05:12
Two very different approaches for getting the same goal: a. You rebase your local and push + force your issue branch to your fork, then PR. Or b. You delete the issue branch in your local AND github and start over from branching out of head in master. In either case make sure to only alter the involved file. Every time you do git add, first verify which files were changed with git status. Also read about git checkout and git reset, they are very useful to undo mistakes before pushing.
Ariel Vallese
@alariva
Nov 22 2016 05:30
Also, just FYI, Im letting you know this in order to follow good practices. Your PR is harmless and I can merge it anyway, it would only introduce an unwanted emptyspace, thats all 😂. Let me know and I may merge tomorrow if you dont want to kess with these commands now. Catch up tomorrow! Thanks
Kashyap Sharma
@Kashyap12
Nov 22 2016 11:30
dont want to mess it now, please merge the PR
:)
Ariel Vallese
@alariva
Nov 22 2016 11:37
I will within a while, please keep that in mind for the next nones 👽
Kashyap Sharma
@Kashyap12
Nov 22 2016 11:51
Sure