Resolve merge conflicts

SourceTree > rebase branch on top of Develop > Merge Conflicts !


Go to Visual Studio > Team Explorer > Changes > Conflicts

Click each conflict and click MERGE button.
Resolve (left side) by adding both changes.
Click "Accept Merge" top left.

Conflicts are resolved.


Go to SourceTree. Will not be on a branch. Stage all changes.
> Terminal > git rebase --continue

This will finish rebase and go to correct branch. If all looks good, then do a final push:
> Terminal > git push -f origin feature/3100_NewFeatureBranch

React JS notes

- ES7 to generate quick template

In VS Code, go to 1) Extensions tab  2) Install ES7

This makes creating new JS files easy.

Create new file:  TestFile.js

Type "rce" and press Tab (rcf for function template)

It auto creates this template code:

- UUID (unique id generator)

> CNTL - C to stop dev server
> npm i uuid  (to install package)
> npm start (restart dev server)

import uuid from 'uuid';

id: uuid.v4();   < this will generate the ID

- React Router

> npm i react-router-dom


- HTTP API library (Axios) - can use instead of jQuery or fetch

> npm i axios