Git Merge Another Branch
git merge – master – dev – master merge dev git merge another branch.xmind
git merge – master – dev – master merge dev git merge another branch.xmind
squash commits original scene git rebase -i a60635 combine last three commits by squash final scene squash commits by git.xmind
I upgrade my server OS to CentOS 8.1, besides that the PHP, WordPress, and apache had been also upgraded to the latest version. All data had been back up by plugin UpdraftPlus, I planned to use it to restore my website. Here are some problems I met when I restored Read more…
Git stash has many common operations that can be represented by following commands. git stash git stash list git stash pop [–index] [stash_id] git stash apply [–index] [stash_id] git stash drop [stash_id] git stash clear Now we will learn a few other powerful options. git stash push After October 2017, Read more…
The library OpenCTM can be used to compress 3D data files. The new compressed file has only about 1/10 size compared with the original file. We can use vertex property to store the model’s color which is often PointData’s scalar in VTK. The following code snippet shows how to use Read more…
The Basic Knowledge About Docker. To find all containers and images: [parallels@localhost ~]$ docker ps CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES [parallels@localhost ~]$ docker images REPOSITORY TAG IMAGE ID CREATED SIZE mono latest 2ba93b1033ba 2 weeks ago 690MB hello-world latest fce289e99eb9 11 months ago 1.84kB To read information Read more…
Last night I read some pages in VTKUsersGuide to learn VTK factory mechanism. I got the basic steps of defining my own factory and use it. Implement virtual function which is declared in vtkObjectFactory. virtual const char* GetVTKSourceVersion(); virtual const char* GetDescription(); Create Object Use the protected function RegisterOverride which Read more…
Email is used in our working frequently, we have to send emails to different people, it is too boring to send similar content to different friends manually. Python can help us to handle the task successfully, we need to use the library smtplib and email.mime.text. I use my sina account Read more…
Many git commands have a interesting option –patch or -p for short, it allows a user to go through every change and asks what to do instead of adding all changes in the file to a new index. git add -p Developer often edits the same file multiple times and Read more…