Skip to content

vividbreeze Dev Blog

  • About
  • vividbreeze.com
  • Privacy Policy

Tag: merge conflict

Git Rebase Clean View

Git Branches – Working with Branches – Part III – Merging versus Rebasing

24/03/201819/05/2018Chris

You have learned how to merge two branches and how to deal with merge-conflicts. When you develop new features it makes sense to develop them on a branch that is based on the latest version of your Master branch. If the feature branches are based on the non-current version of the Master branch than...

Git Merge Conflict Commit View

Git Branches – Working with Branches – Part II (Merge Conflicts)

23/03/201819/05/2018Chris

Branching sounds fine, but quite often so-called merge-conflicts occur, even in a single-user local-git-repository environment. You created a feature branch A to develop a new feature. To implement the new feature you have to add and change a lot of the CSS in styles.css Suddenly a bug appears on your website. To fix the bug,...

Recent Posts

  • Hackintosh – The Hardware
  • Installing Artifactory with Docker and Ansible
  • Docker Networking – Overlay Network
  • Docker Networking – Bridge Network
  • Docker Swarm – Multiple Nodes

Categories

  • AWS
  • Build
  • Configuration Management
  • Design Patterns
  • Docker
  • Environment
  • Infrastructure as Code
  • Java Spring
  • Services
  • Uncategorized
  • Version Control

Tags

ansible ansible galaxy aws bitbucket branches build build tool classloading configuration management dependency injection design patterns docker docker-compose docker-machine docker stack docker swarm ec2 encryption git github infrastructure infrastructure as code inversion of control iterm java jre jvm maven merge merge conflict mvn playbook rebase service servlet shell spring mvc ssh swarm terminal vagrant Vagrantfile version control webcontainer zsh
© 2022 vividbreeze Dev BlogTheme by Puro