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

6th
Oct 2016
Ankit Saini
@sainiak009
Oct 06 2016 02:06
Issue #2452 #2453 seems connected to each other. I have understood code for sales tab in admin panel and would like to work on these issues.
Niranjan Rajendran
@niranjan94
Oct 06 2016 02:10
@sainiak009 I'm working on that...
Ankit Saini
@sainiak009
Oct 06 2016 02:10
Okay. Is I can assist you in any way ?
@niranjan94
Niranjan Rajendran
@niranjan94
Oct 06 2016 02:13
@sainiak009 I'll let you know... Those two issues have
A considerable amount of features to add to the systems
In the mean time... You could try out the various other issues...
:)
Ankit Saini
@sainiak009
Oct 06 2016 02:15
@niranjan94 Okay. And Please review my pull request #2446
Niranjan Rajendran
@niranjan94
Oct 06 2016 02:16
Will do in a while. I'm away from my laptop right now.
Ankit Saini
@sainiak009
Oct 06 2016 02:17
And There is problem with responsiveness of DataTables in admin dashboard.
I think we should add an issue for it.
Niranjan Rajendran
@niranjan94
Oct 06 2016 02:18
Sure... Could you Open an issue with a proper description and screenshots...?
Ankit Saini
@sainiak009
Oct 06 2016 02:19
Yes. I will open an issue for it.
Niranjan Rajendran
@niranjan94
Oct 06 2016 02:19
Thanks :D
Ankit Saini
@sainiak009
Oct 06 2016 02:19
:)
Anant Prasad
@anantprsd5
Oct 06 2016 05:45
Hello, I am new to this community and would like to contribute to the Fossasia open event webapp project. I have also registered for the codeheat competition so can someone please add me to the fossasia codeheat team on github?
Saptak Sengupta
@SaptakS
Oct 06 2016 08:48
@anantprsd5 currently open event orga server project is the one participating in codeheat.
But if you are interested in webapp you can still contribute to webapp.
Ankit Saini
@sainiak009
Oct 06 2016 14:09
I have 4 commits in #2446 . Please tell me how to squash them or anything else to merge them in one commit
Shivam Mamgain
@shivamMg
Oct 06 2016 14:30

you can rebase interactively to squash. make sure you're on your branch with the commits. if you've 4 commits, you can specify it in rebase with:

git rebase -i HEAD~4

your default editor will open up, with the 4 commit messages. Remove pick and add squash in front of the commits you want to squash. There should be only 1 pick commit, the one that you want to specify. save and quit the editor and you'll have squashed commits

also you'll need to count the merge commits as well
Shivam Mamgain
@shivamMg
Oct 06 2016 14:35
if someone can check allow squash merging
Ankit Saini
@sainiak009
Oct 06 2016 14:38
I did it
but now it's showing one more commit with previous commits
Shivam Mamgain
@shivamMg
Oct 06 2016 16:13
hmm..it's hard to tell what's going wrong
do you still see all the commits that you squashed?
Ankit Saini
@sainiak009
Oct 06 2016 16:14
yes
Shivam Mamgain
@shivamMg
Oct 06 2016 16:14
even after rebasing?
Ankit Saini
@sainiak009
Oct 06 2016 16:14
yes after pulling and pushing again
my git status is showing
HEAD detached from 7430063
Shivam Mamgain
@shivamMg
Oct 06 2016 16:17
after doing rebase?
when then checkout your branch first
and then look at your commits with log
Ankit Saini
@sainiak009
Oct 06 2016 16:20
on checkout : Warning: you are leaving 1 commit behind, not connected to
any of your branches:
Shivam Mamgain
@shivamMg
Oct 06 2016 16:21
what does git branch display?
Ankit Saini
@sainiak009
Oct 06 2016 16:22
it's shows two branch "development" and the one I created just now after warning
Shivam Mamgain
@shivamMg
Oct 06 2016 16:23
which one is selected? the one you created?
Ankit Saini
@sainiak009
Oct 06 2016 16:23
I checked git log for both
Shivam Mamgain
@shivamMg
Oct 06 2016 16:24
also is that commit the rebase one?
Ankit Saini
@sainiak009
Oct 06 2016 16:25
this is from development branch
second last commit is after stashing
and after that 4 commits are those which i tried to stash
Shivam Mamgain
@shivamMg
Oct 06 2016 16:28
stash?
squash?
Ankit Saini
@sainiak009
Oct 06 2016 16:28
yes squash
Shivam Mamgain
@shivamMg
Oct 06 2016 16:43
can you rebase again and check?
you can checkout to a new branch and check
do the rebasing again,
Ankit Saini
@sainiak009
Oct 06 2016 16:44
yes rebased and trying again
Shivam Mamgain
@shivamMg
Oct 06 2016 16:45
also if you can take a screenshot of your editor
it would help
try it in a new branch
i see your single commit now
looks like it worked :smile:
Ankit Saini
@sainiak009
Oct 06 2016 16:47
Okay It's done just now :)
Shivam Mamgain
@shivamMg
Oct 06 2016 16:47
:+1:
Ankit Saini
@sainiak009
Oct 06 2016 16:48
with these commands : git reset --soft HEAD~4
git commit -m "message"
Shivam Mamgain
@shivamMg
Oct 06 2016 16:49
:+1:
but squashing works well when you have previous commits
@mariobehling can you please enable squash and merge for the repo https://i.imgur.com/4f9g2Lq.png
Mario Behling
@mariobehling
Oct 06 2016 16:53
@shivamMg done
Ankit Saini
@sainiak009
Oct 06 2016 16:55
Please merge my pull request #2446