Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create bonn.json #41

Merged
merged 1 commit into from
Jul 12, 2016
Merged

Create bonn.json #41

merged 1 commit into from
Jul 12, 2016

Conversation

daimpad
Copy link
Contributor

@daimpad daimpad commented Apr 11, 2016

Die Bonner Marktdaten

@johnjohndoe
Copy link
Member

@daimpad Thanks for joining the project. I spotted a few things to improve:

  • Please add Bonn to the alphabetic list of cities in the README.md.
  • Please stick to the opening hours format ... use 08:00 instead of 8:00.

The contribution guide describes best how to update your patch-1 branch and this pull request. If you get stucked please contact me and we will sort it out together.

@johnjohndoe
Copy link
Member

johnjohndoe commented Apr 14, 2016

Here is how you can update your patch-1 branch on your local machine:

$ git checkout patch-1
$ git rebase -i HEAD~3

Flag the latest two commits with the hash codes b94df and c8faf as fixup. Then save and leave the editor. This will merge the changes of these two commits into the first commit 1bd1c. A single commit with as new has will be left on the branch patch-1.

Now reset and update your master branch to get the latest commits from this repository. This requires you have added this repository as a second remote named wo-ist-markt (or some other alias).

$ git checkout master
$ git reset --hard d3752
$ git pull wo-ist-markt master
$ git push --force origin master

Now move your patch-1 branch on top of master.

$ git rebase master patch-1

Finally, push the branch to GitHub. This will update this pull request because GitHub recognizes the same branch name.

$ git checkout patch -1
$ git push --force origin patch-1

@johnjohndoe johnjohndoe self-assigned this Apr 15, 2016
@dirkschumacher
Copy link
Member

I think something went wrong with the commit messages. Maybe our Chief Git Officer @johnjohndoe can help?

@johnjohndoe
Copy link
Member

@dirkschumacher: @daimpad and I were chatting about it on Monday. We will sort in out another day. We need some basic shell + Git setup first on Damian's machine. I assigned this pull request to me - just leave it as it is.

@johnjohndoe johnjohndoe merged commit 4b8ba6f into wo-ist-markt:master Jul 12, 2016
@johnjohndoe
Copy link
Member

Nice! Welcome to the website ❤️
Please have a look at #38.

joergreichert added a commit to joergreichert/wo-ist-testzentrum.github.io that referenced this pull request Dec 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants