search

fossasia / pslab-hardware

PSLab Hardware Design and Schematics https://pslab.io
Apache License 2.0
1.64k stars 92 forks source link

Partly Fix #6 . Merge with upstream #7

Closed jithinbp closed 7 years ago

jithinbp commented 7 years ago
mariobehling commented 7 years ago

Thanks. Let's start to follow best practices more closely.

  1. Please squash commits. There are a lot of commits in this small change.
  2. Please add the issue you are fixing in the - description - itself (makes it faster for the reviewer who can click on it) and avoid it in the commit heading. The commit heading should rather state what are the changes.
jithinbp commented 7 years ago

@mariobehling I had trouble merging upstream changes to the local copy of my fork. The commits reflect the struggle. :( I believe I might run into the same problem with the pslab-firmware repository since I have renamed 'reference docs' to 'docs' . Can you provide some clarity on how I can merge upstream changes that were made before I commit my latest changes? Also, how frequently should I make pull requests?

Issues will go into descriptions from now on.

mariobehling commented 7 years ago

@jithinbp Github usually provides an easy way. Simply commit your changes to your local branch and make a PR to the project. Github then shows a button "Update branch". Simply use this one.