Category: versioning

Git: Rebase – When and Where Not To Do

Posted on By Andre Dias No Comments on Git: Rebase – When and Where Not To Do
versioning

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” »

GIT: Using Git to Sync Workspaces for VSCode, Eclipse or Whatever

Posted on By Andre Dias No Comments on GIT: Using Git to Sync Workspaces for VSCode, Eclipse or Whatever
soft, versioning

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” »

GIT: Solving conflicts preserving my files – An easy way without merging

Posted on By Andre Dias No Comments on GIT: Solving conflicts preserving my files – An easy way without merging
versioning

>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” »

GIT: I do love Git stash – Super hero when things go wrong

Posted on By Andre Dias No Comments on GIT: I do love Git stash – Super hero when things go wrong
versioning

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” »

GIT: MERGE ALTERNATIVES FOR MANY CONFLICTS

Posted on By Andre Dias No Comments on GIT: MERGE ALTERNATIVES FOR MANY CONFLICTS
versioning

#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” »

GIT: RESOLVING .GITIGNORE ISSUE IN A MESSY PROJECT

Posted on By Andre Dias 1 Comment on GIT: RESOLVING .GITIGNORE ISSUE IN A MESSY PROJECT
versioning

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 very used branch. After updating or merging your local stuff, check the … Read More “GIT: RESOLVING .GITIGNORE ISSUE IN A MESSY PROJECT” »