Note: You must be added to the FluxStore-Pro repo to update from FluxStore-PRo

1. Fork repo FluxStore-Pro

• Open gitlao repo website of fluxstore-pro: https://gitlab.com/inspireui/fluxstore-pro

• Click the Fork button to fork the fluxstore-pro repo to your git repo.

• Select a namespace to fork the project

Forking…

• Fork is complete.

• Now clone your source and build it.

2. Install and Manage source with SourceTree

• Visit the following website to download SourceTree: https://www.sourcetreeapp.com/

• Once the download is complete, open the installation file and start installing SourceTree

• Click "I agree to the Atlassian Customer Agreement" and "Continue" to install SourceTree

• Click "Use an existing account" to continue.

• If you have an account, log in with your account. If you do not have an account, you can sign in with google.

• Next, press skip setup. We will set up an account in a later step.

• Now, drag your project folder to SourceTree (or you can choose a folder)

• Double click on your project on sourcetree.

• Next, enter your gitlab account and click OK to finish.

• Next, double click on your project on SourceTree again to open the log management interface of your git project.

• Now try to change something in your project and commit them to git.

For example I will try to change my version code project.

Re-open SourceTree, click on the "Commit" button in the upper left

• Because at the first time, SourceTree may force you to enter an email for the repo. Please enter your project management gitlab email correctly.

• Ok, done. Now enter a description for the commit and press the Commit button.

• Press push to update the changes to gitlab server

• Now, visit the project's gitlab page to check it out

3. Update code from Repo Fluxstore-Pro to your repo project that has forked

• Quickly open the terminal in your project by opening SourceTree and pressing "Terminal" in the upper right corner.

• Add the original repository as remote repository called "upstream". This helps you to get the latest updates from Fluxstore-Pro

Command:

git remote add upstream https://gitlab.com/inspireui/fluxstore-pro

• Now let's get Fetch changed from FluxStore-Pro to your project.

• You can use the command or the interface.

  • Use the command:

  git fetch upstream git pull upstream

- Use the interface:

• After the pull source is completed.

• Now merge the code from Fluxstore-pro into your project.

• Right-click on the commit you want to merge, select Merge...

• Uncheck Commit merged changes immediately if you are not sure about the changes. Otherwise, leave it as it is and click OK.

• Then press push to finish.

NOTE:

• In some cases, your changes coincide with those of FluxStore-Pro. Now SourceTree will notify you of a conflict when you pull merge code from FluxStore-Pro.

• Click OK to continue

• Back to SourceTree, press "Commit" to see the changes.

• As shown below, I was conflicted with the FluxStore-Pro import code. Now, open your project with Visual Code to fix these conflicts.

• Since I Merge from FluxStore-Pro into my project, "Accept Current Change" refers to my code. And Accept Comming Change is the code of FluxStore-Pro that conflicts with me.

• In this case I want to keep my code. So I will choose "Accept Current Change". Conversely, if you want to get the FluxStore-Pro code, select "Accept Comming Change".

• Remember to double check and rebuild the code after the complete fix conflict has been completed to ensure that the source code commit fails.

• Return to SourceTree and click Commit when done.

• Push code