Added Exporting Code, Branching & Collaboration, Running and Testing sections #30
Conversation
|
|
pinkeshmars
changed the title
…umentation into pinkesh/export-code
pinkeshmars
changed the title
pinkeshmars
changed the title
| # Branching | ||
| Branching creates a separate copy of your work, so you can add new features without disrupting your current progress. It enables multiple developers or teams to work simultaneously on different features without interfering with each other. | ||
|
|
||
| Suppose you have a digital cookbook app and you want to introduce a new feature, such as a shopping list. Instead of adding it directly to your main app and possibly causing issues, you create a branch to work on this new feature. Once it's done, you can bring it back into the main app. |
There was a problem hiding this comment.
We should change to stay with the eComm example
docs/testing-deployment-publishing/branching-collaboration/branching.md
Outdated
Show resolved
Hide resolved
|
|
||
|  | ||
|
|
||
| ### Resolve conflicts |
There was a problem hiding this comment.
We should show the config view as well
…umentation into pinkesh/export-code
| **Bob's Changes (Branch: `feature-bob`)** | ||
|
|
||
| - Changes the button text to "Send" | ||
| - Changes the button color to green |
There was a problem hiding this comment.
Can we make this part into a grid table with branch name and changes as columns? Might look cleaner and easier to explain.
| allow="clipboard-write"> | ||
| </iframe> | ||
| </div> | ||
|
|
There was a problem hiding this comment.
Add p tag after this to create some space
| allow="clipboard-write"> | ||
| </iframe> | ||
| </div> | ||
|
|
| </iframe> | ||
| </div> | ||
|
|
||
| For certain conflicts, such as those involving variables and API configurations, you'll see a **View Configuration** option. Enabling this option allows you to easily identify what has changed. |
There was a problem hiding this comment.
Correct me if I'm wrong, but isnt this part about the generated code differences? If yes, i feel it should be highlighted in this section with a bit more details.
There was a problem hiding this comment.
Yes, internally, it is a generated code difference only, but we don't show this option for widget conflicts (although there is a conflict in the widget's generated code).
|
|
||
| ### Before merging or rebasing | ||
|
|
||
| Your feature branch has two commits: Commit 1 and Commit 3 (which are your changes), and Commit 2 (made by a colleague in the main branch). |
There was a problem hiding this comment.
Add Commit 1 and Commit 3 kinda text under code tags
| allow="clipboard-write"> | ||
| </iframe> | ||
| </div> | ||
|
|
There was a problem hiding this comment.
Add p tags, and check all the pages and ensure arcades are not sticking with the text
|
|
||
| To access the device logs, first run your app using the local run. Then, open the test menu and click on **Logs** icon. This will display a floating window with detailed logs of the app while it's running. | ||
|
|
||
|  |
There was a problem hiding this comment.
Can we pls scale down this image with some more padding on the sides so its not so blurry?
|
|
||
| If you need to update the Flutter SDK version, run Flutter Doctor, or start the simulator again, simply open the test menu and click **Configure**. | ||
|
|
||
|  |
There was a problem hiding this comment.
Same comment about scaling down
|
|
||
| 1. Take note of your FlutterFlow project version. | ||
|
|
||
|  |
|
|
||
| --- | ||
|
|
||
| ## Troubleshooting |
There was a problem hiding this comment.
Can we move the troubleshooting questions under expanded sections like FAQs so its easier to navigate and looks cleaner?
|
One more ask: I forgot that we were writing the Github docs in this PR, and I had migrated the old docs to here without re-write, can you look into that section under Integrations and ensure all information is moved to your exporting code section and then remove my github integration folder completely from this PR? @pinkeshmars |
|
Hey @PoojaB26, All your review comments are addressed now. |
Description
Linear ticket and magic word Fixes
Fixes DEVR-347
Fixes DEVR-345
Fixes DEVR-346
Fixes DEVR-344
Type of change