Skip to content
  • Home
  • Search
  • Tools
  • About
  • Terms of Service Agreement
  • Log In
  • Guest

Category: versioning

Git: Rebase – When and Where Not To Do

Posted on January 19, 2021August 2, 2023 By Andre Dias
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 September 17, 2020September 20, 2020 By Andre Dias
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 September 8, 2020January 21, 2021 By Andre Dias
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 September 1, 2020January 21, 2021 By Andre Dias
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 June 24, 2018August 30, 2020 By Andre Dias
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 June 16, 2018March 27, 2025 By Andre Dias
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 branch. After updating or merging your local stuff, check the .gitignore content. … Read More “GIT: RESOLVING .GITIGNORE ISSUE IN A MESSY PROJECT” »

Search

Generic selectors
Exact matches only
Search in title
Search in content
Post Type Selectors
Filter by Categories
angular
bootstrap
browser
computer science
container
data persistence
database
devops
editors
hardware
health
hosting
info
internet
it
java
javascript
network
node.js
play
protocol
security
self-help
selfhelp
server
services
soft
software engeneering
sql
support
Systems
techs
Uncategorized
versioning
web
web design
windows
wordpress

Recent Posts

  • Angular From Scratch Tutorial – Step 9: Modal
  • Angular From Scratch Tutorial – Step 8: Miscellany
  • Angular From Scratch Tutorial – Index
  • angular: Reading JSON files
  • NODE.JS: SEQUELIZE: MVC Project – 4TH STEP

Categories

  • angular (19)
  • bootstrap (6)
  • browser (4)
  • computer science (4)
  • container (1)
  • data persistence (2)
  • database (11)
  • devops (1)
  • editors (1)
  • hardware (4)
  • health (2)
  • hosting (1)
  • info (1)
  • internet (2)
  • it (1)
  • java (13)
  • javascript (32)
  • network (6)
  • node.js (1)
  • play (1)
  • protocol (1)
  • security (4)
  • self-help (1)
  • selfhelp (1)
  • server (2)
  • services (1)
  • soft (1)
  • software engeneering (1)
  • sql (1)
  • support (2)
  • Systems (1)
  • techs (3)
  • Uncategorized (2)
  • versioning (6)
  • web (1)
  • web design (5)
  • windows (3)
  • wordpress (4)

Copyright © 2025 .

Theme: Oceanly by ScriptsTown

We use cookies on our website to give you the most relevant experience by remembering your preferences and repeat visits. By clicking “Accept All”, you consent to the use of ALL the cookies. However, you may visit "Cookie Settings" to provide a controlled consent.
Cookie SettingsAccept All
Manage consent

Privacy Overview

This website uses cookies to improve your experience while you navigate through the website. Out of these, the cookies that are categorized as necessary are stored on your browser as they are essential for the working of basic functionalities of the website. We also use third-party cookies that help us analyze and understand how you use this website. These cookies will be stored in your browser only with your consent. You also have the option to opt-out of these cookies. But opting out of some of these cookies may affect your browsing experience.
Necessary
Always Enabled
Necessary cookies are absolutely essential for the website to function properly. These cookies ensure basic functionalities and security features of the website, anonymously.
CookieDurationDescription
cookielawinfo-checkbox-analytics11 monthsThis 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-functional11 monthsThe cookie is set by GDPR cookie consent to record the user consent for the cookies in the category "Functional".
cookielawinfo-checkbox-necessary11 monthsThis 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-others11 monthsThis 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-performance11 monthsThis 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_policy11 monthsThe 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.
Functional
Functional cookies help to perform certain functionalities like sharing the content of the website on social media platforms, collect feedbacks, and other third-party features.
Performance
Performance cookies are used to understand and analyze the key performance indexes of the website which helps in delivering a better user experience for the visitors.
Analytics
Analytical cookies are used to understand how visitors interact with the website. These cookies help provide information on metrics the number of visitors, bounce rate, traffic source, etc.
Advertisement
Advertisement cookies are used to provide visitors with relevant ads and marketing campaigns. These cookies track visitors across websites and collect information to provide customized ads.
Others
Other uncategorized cookies are those that are being analyzed and have not been classified into a category as yet.
SAVE & ACCEPT