Source code management: Revision history

10 August 2019

• curprev 02:4402:44, 10 August 2019‎ Vocx talk contribs‎ 39,741 bytes +38‎ →‎Squashing commits: In this example, starting from "feature A" many commits are made to implement "feature B"; You can use git log --oneline again to observe the new commit history.
• curprev 02:2602:26, 10 August 2019‎ Vocx talk contribs‎ 39,703 bytes +39‎ →‎Squashing commits: You should squash only small commits to a single file; big changes to the code across multiple files should contain the full commit history.
• curprev 01:4501:45, 10 August 2019‎ Vocx talk contribs‎ 39,664 bytes +755‎ →‎Squashing commits: More information and details about squashing commits.

9 August 2019

• curprev 23:0523:05, 9 August 2019‎ Vocx talk contribs‎ 38,909 bytes +1,847‎ No edit summary
• curprev 21:3621:36, 9 August 2019‎ Vocx talk contribs‎ 37,062 bytes +25‎ Don't translate the code

8 August 2019

• curprev 18:3918:39, 8 August 2019‎ Vocx talk contribs‎ 37,037 bytes +68‎ the main repository is forked online and cloned to an offline computer (0);
• curprev 18:3418:34, 8 August 2019‎ Vocx talk contribs‎ 36,969 bytes +163‎ Added numbers to the caption of the image

6 August 2019

• curprev 20:4720:47, 6 August 2019‎ Mario52 talk contribs‎ 36,806 bytes +1,245‎ Marked this version for translation

30 July 2019

• curprev 00:1900:19, 30 July 2019‎ Vocx talk contribs‎ 35,561 bytes +56‎ →‎Merging the branch (pull request): Link to pull request explaining the concept

28 July 2019

• curprev 19:1919:19, 28 July 2019‎ Vocx talk contribs‎ 35,505 bytes −5‎ More information on alternative repositories
• curprev 18:5918:59, 28 July 2019‎ Vocx talk contribs‎ 35,510 bytes +14‎ new branches are used to commit changes and additions to the code;
• curprev 18:5718:57, 28 July 2019‎ Vocx talk contribs‎ m 35,496 bytes +3‎ gitk (the first graphical interface developed)
• curprev 18:5418:54, 28 July 2019‎ Vocx talk contribs‎ 35,493 bytes +420‎ Image: Generic workflow to develop code for FreeCAD using {{incode|git}}; the main repository is forked and cloned, new branches are used to commit changes to the code; the branches are pushed to the remote repositories, and a pull request is created.
• curprev 05:5805:58, 28 July 2019‎ Vocx talk contribs‎ 35,073 bytes +99‎ Added "qgit" and "tig" as Qt and Ncurses interfaces.
• curprev 03:3803:38, 28 July 2019‎ Vocx talk contribs‎ 34,974 bytes +100‎ Link to "Git Branching" in the Pro Git book.
• curprev 03:3303:33, 28 July 2019‎ Vocx talk contribs‎ 34,874 bytes +92‎ Added "gitk", as it is the basic interface that comes with git
• curprev 03:1203:12, 28 July 2019‎ Vocx talk contribs‎ 34,782 bytes +359‎ You can also show more information with the show keyword.
• curprev 02:5802:58, 28 July 2019‎ Vocx talk contribs‎ 34,423 bytes +129‎ Inspect the changes of a single file through various commits:
• curprev 00:4600:46, 28 July 2019‎ Vocx talk contribs‎ 34,294 bytes +240‎ Links to basic merge and advanced merge
• curprev 00:3600:36, 28 July 2019‎ Vocx talk contribs‎ 34,054 bytes +545‎ Image moved to the source code section
• curprev 00:3000:30, 28 July 2019‎ Vocx talk contribs‎ 33,509 bytes −790‎ Moved section earlier
• curprev 00:2200:22, 28 July 2019‎ Vocx talk contribs‎ 34,299 bytes +216‎ Merging local branches with git merge will occasionally present conflicts, as the files may have been changed at the same time in the same place. If this happens you should fix the files, and re-commit.
• curprev 00:2000:20, 28 July 2019‎ Vocx talk contribs‎ 34,083 bytes +143‎ →‎Revision hash of a specific commit number: Since the log may show you two close commits, confirm it's the right commit number. If it's off by one, just pick the next commit in the sequence (before or after) and check again.
• curprev 00:1600:16, 28 July 2019‎ Vocx talk contribs‎ 33,940 bytes +11‎ "Check out GitHub requests locally" is moved to the end, because the information it has is strange, and I'm not sure what exactly it is about.
• curprev 00:1300:13, 28 July 2019‎ Vocx talk contribs‎ 33,929 bytes +70‎ →‎Keeping the GitHub repository up to date: More information
• curprev 00:0800:08, 28 July 2019‎ Vocx talk contribs‎ 33,859 bytes +1,235‎ →‎Keeping the GitHub repository up to date: More information on deleting a branch.

27 July 2019

• curprev 23:1023:10, 27 July 2019‎ Vocx talk contribs‎ 32,624 bytes +80‎ Although Git allows you to merge different branches of code with git merge (in your computer) or a pull request (online), there are times when it may be desirable to create a traditional "patch", which can be sent as an attachment through email.
• curprev 22:0022:00, 27 July 2019‎ Vocx talk contribs‎ 32,544 bytes 0‎ No edit summary
• curprev 21:5921:59, 27 July 2019‎ Vocx talk contribs‎ 32,544 bytes +790‎ Image: Generic workflow to develop code for FreeCAD; everybody can get the code from the main repository, but the main developers have the exclusive right to review and merge submissions by other developers.

26 July 2019

• curprev 17:4917:49, 26 July 2019‎ Vocx talk contribs‎ 31,754 bytes +2‎ →‎Rebasing from upstream: Use forward slash instead of vertical bar |
• curprev 15:1115:11, 26 July 2019‎ Vocx talk contribs‎ 31,752 bytes +7‎ →‎Keeping the GitHub repository up to date: git pull upstream master; Because this is not the default configured remote for your current branch, you must specify a branch on the command line.
• curprev 15:0015:00, 26 July 2019‎ Vocx talk contribs‎ 31,745 bytes +359‎ →‎Merging the branch (pull request): Pull request successfully merged and closed You’re all set — the GITHUB_USERNAME:myNewBranch branch can be safely deleted. If you wish, you can also delete your fork of FreeCAD/FreeCAD.
• curprev 14:4914:49, 26 July 2019‎ Vocx talk contribs‎ 31,386 bytes −4‎ →‎Keeping the GitHub repository up to date: This branch is 2 commits ahead, 14 commits behind FreeCAD:master.
• curprev 00:0800:08, 26 July 2019‎ Vocx talk contribs‎ 31,390 bytes +735‎ →‎Keeping the GitHub repository up to date: As for your original master branch, it will never be automatically updated by GitHub; this is something that you must do yourself. Switch to the master branch, then pull from upstream

25 July 2019

• curprev 23:4923:49, 25 July 2019‎ Vocx talk contribs‎ 30,655 bytes +153‎ →‎Merging the branch (pull request): For big additions to the source code, you should create another branch, develop your features there, and then submit a separate pull request for this branch.
• curprev 23:1723:17, 25 July 2019‎ Vocx talk contribs‎ 30,502 bytes +363‎ →‎Merging the branch (pull request): you may continue working (git commit -a) on the same branch while you wait for merge approval; if you git push again, a second merge commit will be queued in the same pull request,
• curprev 22:4122:41, 25 July 2019‎ Vocx talk contribs‎ 30,139 bytes +273‎ →‎Keeping the GitHub repository up to date: After this is done, GitHub will let you know that your are synchronized with the upstream repository.
• curprev 22:3122:31, 25 July 2019‎ Vocx talk contribs‎ 29,866 bytes +722‎ →‎Merging the branch (pull request): Now you just have to wait for the administrators to merge of your branch. When this happens, your changes will be added to the end of the master branch.
• curprev 21:5421:54, 25 July 2019‎ Vocx talk contribs‎ 29,144 bytes +55‎ →‎Rebasing from upstream: Small additions
• curprev 21:4221:42, 25 July 2019‎ Vocx talk contribs‎ 29,089 bytes +189‎ The regular developer doesn't have write access to the upstream repository https://github.com/FreeCAD/FreeCAD, therefore, you shouldn't push code to this remote server.
• curprev 21:0421:04, 25 July 2019‎ Vocx talk contribs‎ 28,900 bytes +76‎ FreeCAD has adopted a format mentioned in the Pro Git book, which consists of a short message, and then a larger descriptive paragraph.
• curprev 21:0221:02, 25 July 2019‎ Vocx talk contribs‎ m 28,824 bytes +8‎ for example
• curprev 21:0121:01, 25 July 2019‎ Vocx talk contribs‎ 28,816 bytes +296‎ Branches are inexpensive, they don't copy the entire source tree, but merely create a point in time on top of which you will write code; thus branches help keep work in progress separate from the main code.
• curprev 20:4820:48, 25 July 2019‎ Vocx talk contribs‎ 28,520 bytes +20‎ Alternatively, perform both steps with a single instruction:
• curprev 20:4420:44, 25 July 2019‎ Vocx talk contribs‎ 28,500 bytes −136‎ Git commit will be mentioned later, so it's removed from this section
• curprev 20:4020:40, 25 July 2019‎ Vocx talk contribs‎ 28,636 bytes +62‎ The present document focuses on the use of Git for FreeCAD development. Compiling FreeCAD is described in Compiling.
• curprev 18:4118:41, 25 July 2019‎ Vocx talk contribs‎ 28,574 bytes +1,066‎ →‎Merging the branch (pull request): Keeping the GitHub repository up to date
• curprev 18:2818:28, 25 July 2019‎ Vocx talk contribs‎ 27,508 bytes +393‎ →‎Rebasing from upstream: More explanatin on the pull operation and the --rebase option
• curprev 17:2617:26, 25 July 2019‎ Vocx talk contribs‎ 27,115 bytes +105‎ Please read Git Branching and GitHub - Contributing to a project to learn more.
• curprev 17:2217:22, 25 July 2019‎ Vocx talk contribs‎ 27,010 bytes +3,086‎ →‎Rebasing from upstream: Information on merging