Closed mli24970 closed 7 years ago
Do I...
1. git pull the changes
On Thu, Dec 15, 2016 at 12:18 PM, Steven Weaver notifications@github.com wrote:
@stevenweaver commented on this pull request.
We might need to use actual git instead of uploading the files directly. I made edits to the css yesterday to fix image locations.
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/veg/hyphy-site/pull/7#pullrequestreview-13176219, or mute the thread https://github.com/notifications/unsubscribe-auth/ATH61SSbI4uL6BkmvjQuXSUwf7wNmKrnks5rIXZ9gaJpZM4LOV5B .
Before making changes, you should always git pull, but it's not a requirement.
The steps are:
git commit
git pull
- You will be notified if there are merge conflictsIf everything merges cleanly:
git push origin master
- Your origin should be your fork, not the veg repoThen you go to github and submit a pull request.
Preferably, you would bundle up all of your commits and submit one single pull request with all of the fixes. So you would only go through these steps once maybe in a day or week. Not multiple times, unless, of course, there is a chaotic emergency.
restyling header text