These are chat archives for fossasia/open-event-server

5th
Feb 2017
Himanshi-Khandelwal
@Himanshi-Khandelwal
Feb 05 2017 06:55
when I am squashing the commits in github

(.venv)himanshi@himanshi-HP-Notebook:~/open-event-orga-server$ git rebase -i HEAD~5

It seems that there is already a rebase-merge directory, and
I wonder if you are in the middle of another rebase. If that is the
case, please try
git rebase (--continue | --abort | --skip)
If that is not the case, please
rm -fr "/home/himanshi/open-event-orga-server/.git/rebase-merge"
and run me again. I am stopping in case you still have something
valuable there.

this comes
Avi Aryan
@aviaryan
Feb 05 2017 06:56
If you are confident you are not in a middle of a rebase, try running rm -fr "/home/himanshi/open-event-orga-server/.git/rebase-merge"
Himanshi-Khandelwal
@Himanshi-Khandelwal
Feb 05 2017 06:57
what is middle of rebase?
Avi Aryan
@aviaryan
Feb 05 2017 07:03
when a rebase process is going on
Himanshi-Khandelwal
@Himanshi-Khandelwal
Feb 05 2017 07:03
I don't know whether I should perform rm -fr "/home/himanshi/open-event-orga-server/.git/rebase-merge"
Avi Aryan
@aviaryan
Feb 05 2017 07:04
Well, what you can do is make a copy of open-event-orga-server repo. This makes a copy of your repo. Then in the real repo, you can try whatever you want
So you can run rm -fr .... to see if it resolves your git rebase issue
If anything goes wrong, you have your backup
Himanshi-Khandelwal
@Himanshi-Khandelwal
Feb 05 2017 07:08
oks
I will try
Himanshi-Khandelwal
@Himanshi-Khandelwal
Feb 05 2017 08:21
I have done this
for stash : after changing all picks except one to squash
himanshi@himanshi-HP-Notebook:~/open-event-orga-server$ git rebase -i HEAD~5app/templates/gentelella/users/events/sessions/base_session_table.html: needs merge
Cannot rebase: You have unstaged changes.
Additionally, your index contains uncommitted changes.
Please commit or stash them.
himanshi@himanshi-HP-Notebook:~/open-event-orga-server$
Abishek V Ashok
@abishekvashok
Feb 05 2017 15:34
There are some unstated changes @Himanshi-Khandelwal either discard them using git clean -df or add and commit them. Then proceed.
Saptak Sengupta
@SaptakS
Feb 05 2017 21:39
Shubham Padia
@shubham-padia
Feb 05 2017 22:03
Thank you @SaptakS , hoping to contribute more towards making eventyay more awesome !!
@SaptakS @niranjan94 Thank you for being awesome mentors :smile:
Mario Behling
@mariobehling
Feb 05 2017 22:07
:clap: Awesome work @shubham-padia @magdalenesuo and thanks @SaptakS @niranjan94 for being fantastic mentors!
Shubham Padia
@shubham-padia
Feb 05 2017 22:09
@mariobehling Thank you :smile: