Skip to content

Instantly share code, notes, and snippets.

View barryblando's full-sized avatar
🗃️

Retr0_0x315 barryblando

🗃️
View GitHub Profile
@barryblando
barryblando / .eslintrc
Last active September 26, 2020 13:35
VSCode Setup Prettier + ESLint + StyleLint for React
{
"extends": [
"airbnb",
"prettier",
"prettier/react"
],
"parser": "babel-eslint",
"parserOptions": {
"ecmaVersion": 8,
"ecmaFeatures": {
@barryblando
barryblando / AvoidMergeConflicts.md
Last active December 26, 2017 01:33
How to Avoid Merge Conflicts

Tip #1 Run the "git pull" command as often as possible

If you're working with a team of other developers you want to constantly be pulling in their commits from the server so that you're working with the latest code you want to make this part of your routine, so running "git pull" just becomes a habit. Any time you sit down to work on your project before you actually edit any files, run a "git pull".

Tip #2 Communicate with your team

Simply communicating with your team can go a long way. Talk with each other about who is responsible for which changes and which parts of the project. Be aware of what each team member is working on for that day or week and you don't need to go overboard and waste a ton of time chatting about what you're working on. But you'd be surprised. Even just having a general idea of what each person is working on will put you in a position where you are far less likely to edit the same lines of code within the same file at the same time and that means less conflicts.

Ti