Open liatsade opened 7 years ago
The solution is to re-roll just before merging.
Not really - the proper way is to constantly merge from master
, otherwise you might find much bigger conflicts.
@savyoncohen as we spoke, please make a check list with basic requirements for the markup developer (code standard, responsive, which browsers/devices to check, and all the issues that you encountered during your tests), so we can submit the list along with the job offer, and also add it to this GitBook chapter. Thanks.
@liatsade Here is a the file I wrote. Tell me what you think: https://docs.google.com/document/d/18mDgml5u-LII6YYS0c0D3koVjVRZe3FUCYLcaaJSKhA/edit
Thanks @savyoncohen, looks good! I wrote some comments inside the document.
I know. It happened all the time - when more than one person working on GitBook in parallel, the
SUMMARY.md
changed. I can fix the conflict now, but it can created again, if someone else continue editing before I merge this PR. The solution is to re-roll just before merging.