Skip to content
View in the app

A better way to browse. Learn more.

Web Designer Forum

A full-screen app on your home screen with push notifications, badges and more.

To install this app on iOS and iPadOS
  1. Tap the Share icon in Safari
  2. Scroll the menu and tap Add to Home Screen.
  3. Tap Add in the top-right corner.
To install this app on Android
  1. Tap the 3-dot menu (⋮) in the top-right corner of the browser.
  2. Tap Add to Home screen or Install app.
  3. Confirm by tapping Install.

Git merging conflicts on Mac

Featured Replies

I use SourceTree on my mac for handling all of git repos because it's easy to navigate around however I really struggle when there are conflicts when merging, I can't seem to find any intuitive tools like that of Tortiose SVN that make merging much easier, with it's clean and intuitive gui.

  • Author

I have this built into my editor, but GitKraken has come up up with quite a nice UI for this.

 

That looks like exactly what I'm looking for!

 

Thanks

Create an account or sign in to comment

Account

Navigation

Search

Search

Configure browser push notifications

Chrome (Android)
  1. Tap the lock icon next to the address bar.
  2. Tap Permissions → Notifications.
  3. Adjust your preference.
Chrome (Desktop)
  1. Click the padlock icon in the address bar.
  2. Select Site settings.
  3. Find Notifications and adjust your preference.