Skip to content

Added instruction to delete contents when overwriting main line #11726

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tknippenberg wants to merge 1 commit into
base: development
Choose a base branch
from
Open

Added instruction to delete contents when overwriting main line #11726

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...fguide/version-control/using-version-control-in-studio-pro/managing-branches.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,10 @@
The second method should be used if the first method is not possible for some reason and you want to "overwrite" the main line with your branch line. To use the second method, follow these steps:

1. Check out both the main line and the branch line locally.
2. Overwrite all the files in the main line app directory with those of the branch line (except for the *.git* directory).
3. Commit your changes using Studio Pro.
4. Reopen the main line app in Studio Pro only after overwriting the files.
2. Close Studio Pro. Reopen the main line app in Studio Pro only **after** completing steps 3 and 4.
3. Delete all the files in the main line app directory (except for the *.git* directory).

Check failure on line 83 in content/en/docs/refguide/version-control/using-version-control-in-studio-pro/managing-branches.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Mendix.Capitalization] Use ''Git'' (capitalized)

Raw Output:
{"message": "[Mendix.Capitalization] Use ''Git'' (capitalized)", "location": {"path": "content/en/docs/refguide/version-control/using-version-control-in-studio-pro/managing-branches.md", "range": {"start": {"line": 83, "column": 74}}}, "severity": "ERROR"}
4. Copy-paste all the files from the branch line directory in the main line app directory (except for the *.git* directory).

Check failure on line 84 in content/en/docs/refguide/version-control/using-version-control-in-studio-pro/managing-branches.md

View workflow job for this annotation

GitHub Actions / vale 

[vale] reported by reviewdog 🐶
[Mendix.Capitalization] Use ''Git'' (capitalized)

Raw Output:
{"message": "[Mendix.Capitalization] Use ''Git'' (capitalized)", "location": {"path": "content/en/docs/refguide/version-control/using-version-control-in-studio-pro/managing-branches.md", "range": {"start": {"line": 84, "column": 109}}}, "severity": "ERROR"}
5. Commit your changes to the main line app directory using Studio Pro.

### Merging Using Git in the Command Line

Expand Down