There are many good posts about the differences between pulling with and without rebase, merge and etc. If you desire to refresh memory about this, try these: git: the difference between git pull and git pull –rebase Git Branching and Merge vs Rebase- This post intends to supply information on when and where not to … Read More “Git: Rebase – When and Where Not To Do” »
Motivation – Why Should I think about this? This article assumes that you have skill to work with Git. Its purpose is not a Git’s tutorial but a direction for an another usage for versioning control. Every developer uses to customize the workspaces of Eclipse, VSCode, etc. As much as you work, more customized it … Read More “GIT: Using Git to Sync Workspaces for VSCode, Eclipse or Whatever” »
>PROBLEM You’ve made a pull and you got conflicts. >SOLUTION An easy alternative without having to merge files. Take note of those files that has conflict issues. Move the conflicting files to a temporary folder. Commit again. git commit -am “solving merge conflicts preserving mine” Reset the state to the previous one, before the pull … Read More “GIT: Solving conflicts preserving my files – An easy way without merging” »
SCENARIO Node.js project using Angular, etc. Usually, manually copying a project like an example above may take a very long time. Making synced snapshots using a sync tool is a better approach. A much better alternative is considering using a versioning tool. I chose Git. Probably, you may apply the concepts suggested here using another … Read More “GIT: I do love Git stash – Super hero when things go wrong” »
#PRE-REQUISITES Make sure that your local repository is committed or stashed. If not, Git will complain, since it is basic versioning procedure. ALTERNATIVE#1 Suppose that your current branch is “feature/branch1”. Do: git commit -am “before merging” or if already committed you may mark this operation using: git commit –allow-empty -am”before merging operation with develop branch” … Read More “GIT: MERGE ALTERNATIVES FOR MANY CONFLICTS” »
PROBLEM There many different .gitignore files into your project. The “.gitignore” seams not working at all. Your pull like commands comes with “ignored files”. SOLUTION Create a .gitignore pattern. Fix your repository’s .gitignore file into master, at least. Same to develop or another branch. After updating or merging your local stuff, check the .gitignore content. … Read More “GIT: RESOLVING .GITIGNORE ISSUE IN A MESSY PROJECT” »
| Cookie | Duration | Description |
|---|---|---|
| cookielawinfo-checkbox-analytics | 11 months | This cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Analytics". |
| cookielawinfo-checkbox-functional | 11 months | The cookie is set by GDPR cookie consent to record the user consent for the cookies in the category "Functional". |
| cookielawinfo-checkbox-necessary | 11 months | This cookie is set by GDPR Cookie Consent plugin. The cookies is used to store the user consent for the cookies in the category "Necessary". |
| cookielawinfo-checkbox-others | 11 months | This cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Other. |
| cookielawinfo-checkbox-performance | 11 months | This cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Performance". |
| viewed_cookie_policy | 11 months | The cookie is set by the GDPR Cookie Consent plugin and is used to store whether or not user has consented to the use of cookies. It does not store any personal data. |