search

sugarlabs / sugar

Sugar GTK shell
GNU General Public License v3.0
252 stars 240 forks source link

Add links to 'Sugar logging in' tutorial #918

Closed shaansubbaiah closed 4 years ago

shaansubbaiah commented 4 years ago

Add links to Sugar login tutorial available at sugar-docs

Fixes #892

shaansubbaiah commented 4 years ago

The first commit appears to be due to merging changes to my fork from upstream. To remove it, I can delete the current fork, create another fork, then add these changes (or) Can only the last 2 commits be merged and pushed?

chimosky commented 4 years ago

Reviewed, thanks.

The two commits can be cherry-picked but you can also do an interactive rebase to the current master and drop the merge commit. Can you also squash the two commits?

$ git rebase -i f1ac684
*change `pick` to `drop` for c60e316 and continue rebase.
shaansubbaiah commented 4 years ago

I tried the above snippet you sent and tried to rebase it, didn't have that commit as an option. Installed GitKraken and was also unsuccessful. Shall I create another branch and make a new PR?

srevinsaju commented 4 years ago

@shaansubbaiah 

git rebase -i f1ac68488631ab153dd31b737819fd5cadc3b158

then, if you do not see https://github.com/sugarlabs/sugar/pull/918/commits/c60e316e693c20b4996c15cbcbba66f3cdeecd8f

Then just save and close to complete the rebase; The merge commit should disappear when you do that

git push -f

It should fix it in theory

chimosky commented 4 years ago

Squashed and merged by hand.

shaansubbaiah commented 4 years ago

@chimosky Thanks, I tried what @srevinsaju suggested and it didn't work. I must have messed up my git tree pretty badly somehow.

I'll go through more git tutorials so it doesn't happen again 👍