pramodshinde / oneplaceaday

README¶ ↑

About the project:¶ ↑

At a happy place.

The idea is to share the story of that happy place of yours with fellow enthusiasts. It could be anyplace you have travelled or came across by chance. All you need is a good quality picture and a story.

Contributing guidelines:¶ ↑

We follow all the basic guidelines followed by rails. We highly recommend to first go through rails contributing guidelines. Here: [Contributing to Ruby on Rails guide](edgeguides.rubyonrails.org/contributing_to_ruby_on_rails.html) For the gist of it, these are the steps you should follow:

1. Fork the main repo rishijain/oneplaceaday

2. Clone from forked repo i.e <your username>/oneplaceaday

3. Since you have forked the repo, remote will be default ‘origin’ and to push code to your new branch

   git push origin my_new_branch
   

4. Add a remote ‘upstream’ to point to main repo.

   git remote add upstream [e-mail]:rishijain/oneplaceaday.git
   

5. It is likely that while you have been working on your branch, the main master has gone some changes. Do these:

Fetch upstream:

git fetch upstream master

Checkout master:

git checkout master

and

git rebase upstream/master
git push origin master

1. To apply your patch on top of these commits,

   git checkout branch_name
   git rebase upstream/master
   git push origin branch_name
   

2. Send Pull Request from your new branch.

Things to remember:¶ ↑

1. Keep your master updated with main repo’s master.

2. Always work on a new branch.

3. Before sending a Pull Request, fetch the main repo’s master commits and reapply your patch on top of latest pulled commits.