Skip to content
This repository has been archived by the owner on Apr 19, 2021. It is now read-only.

[docs] Bash in Gitpod #385

Merged
merged 1 commit into from
Feb 5, 2020
Merged

Conversation

JesterOrNot
Copy link
Contributor

Adds bash to languages_and_frameworks
Please see #383

@jankeromnes
Copy link
Contributor

I took the liberty to clean up your commits and splice out any changes from other Pull Requests. 🙂 Easier to review now.

Copy link
Contributor

@jankeromnes jankeromnes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very nice, thanks a lot @JesterOrNot! 💯 I added a few comments below. Please take a look at them when you have time. 🙂

src/docs/bash_in_gitpod.md Outdated Show resolved Hide resolved
src/docs/bash_in_gitpod.md Outdated Show resolved Hide resolved
src/docs/bash_in_gitpod.md Outdated Show resolved Hide resolved
src/docs/bash_in_gitpod.md Outdated Show resolved Hide resolved
src/docs/bash_in_gitpod.md Outdated Show resolved Hide resolved
src/docs/bash_in_gitpod.md Outdated Show resolved Hide resolved
@jankeromnes
Copy link
Contributor

jankeromnes commented Jan 8, 2020

Please rebase your Pull Request on top of the latest master changes.

It's actually pretty easy. Please do this:

  1. Open this Pull Request in Gitpod by clicking https://gitpod.io/#https://github.com/gitpod-io/website/pull/385
  2. In a Terminal, run git pull --rebase upstream master
  3. If a conflict occurs, run git status to see which files need fixing (in red)
    a. For each conflicting file, open it in an Editor (e.g. Cmd + click on them)
    b. Find the conflicts (the texts between <<<< and ==== and >>>>)
    c. Decide what the final version should be (either by picking one option, or by removing the version you don't want and all the <<==>> characters)
    d. Save the file. Once it's clean, run git add path/to/file/you/just/fixed, and then git rebase --continue

At the end, it should say that the rebase was successful. 👍

EDIT: And when the rebase is successful (make sure it's finished by looking at git status!), simply run git push -f origin JesterOrNot/shell to update your Pull Request.

@JesterOrNot JesterOrNot changed the title [WIP] Bash in Gitpod Bash in Gitpod Jan 21, 2020
@jankeromnes jankeromnes force-pushed the JesterOrNot/shell branch 3 times, most recently from 1bbfd01 to c34dba4 Compare January 23, 2020 17:25
@JesterOrNot JesterOrNot force-pushed the JesterOrNot/shell branch 4 times, most recently from 00d3b43 to f899f8f Compare February 3, 2020 20:31
@JesterOrNot JesterOrNot changed the title Bash in Gitpod [docs] Bash in Gitpod Feb 5, 2020
@nisarhassan12 nisarhassan12 self-requested a review February 5, 2020 02:31
@JesterOrNot JesterOrNot merged commit d681596 into gitpod-io:master Feb 5, 2020
@JesterOrNot JesterOrNot deleted the JesterOrNot/shell branch February 5, 2020 03:13
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants