Merge conflicts in pbxproj

  • Rebase when you want to resolve conflicts one by one, often, I find its easier to resolve all the conflicts at once with a pull or merge, When you rebase your way through conflicts, you may find yourself making changes that create conflicts as you go.
  • Pulling in the branch with the most changes first. When you pull in the largest branch first, you reduce the conflicts you will have to deal with when you cherry pick the incoming commits.
  • Using git cherry-pick with a range of commits instead of pulling in the whole branch which may have a conflicting base, which would cause major issues. git cherry-pick firstSha^..lastSha
  • use a git client like SourceTree.
  • Use a merge command in your .gitAttributes
  • Other habits to adopt: make a unique pr when refactoring file structures, and when refactoring other people’s code.

--

--

--

Love podcasts or audiobooks? Learn on the go with our new app.

Recommended from Medium

How to Automate Your Business Using Odoo.

How to Automate Your Business Using Odoo

Configuring alert notifications for cloud function errors in GCP

ServiceNow Test Management 2.0

GitHub — Use/manage multiple accounts on single system

Java Virtual Machine

LambdaTest Receives Top Distinctions for Test Management Software from Leading Business Software…

How to Secure Azure Kubernetes Clusters?

Introduction to the WS-Federation and Microsoft ADFS

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store
Scott

Scott

More from Medium

Application Frameworks Blog(Week5,6)

Create an API for Self-Driving Cars with NodeJS

Introduction to Git and GitHub

Version controlling